toji 1.2.0 → 1.3.0

data/lib/toji/schedule/calendar.rb

@@ -0,0 +1,115 @@
+module Toji
+  module Schedule
+    class Calendar
+      attr_reader :products
+
+      def initialize
+        @products = []
+      end
+
+      def <<(product)
+        @products << product
+        self
+      end
+      alias_method :add, :<<
+
+      def date_rows
+        events = @products.map{|product| product.events}.flatten
+
+        result = {}
+        events.each {|event|
+          result[event.date] ||= DateRow.new(event.date)
+          result[event.date] << event
+        }
+
+        result
+      end
+
+      def table_data
+        events = @products.map{|product| product.events}.flatten
+
+        koji_len = events.select{|e| e.type==:koji}.map(&:group_index).max + 1
+        rice_len = events.select{|e| e.type==:rice}.map(&:group_index).max + 1
+        min_date = events.map(&:date).min
+        max_date = events.map(&:date).max
+
+        headers = [:date]
+
+        case koji_len
+        when 1
+          headers += [:koji]
+        when 2
+          headers += [:moto_koji, :moromi_koji]
+        else
+          headers += [:moto_koji]
+          (2..koji_len).each {|i|
+            headers << "moromi_koji#{i-1}"
+          }
+        end
+
+        case rice_len
+        when 1
+          headers += [:moto]
+        when 2
+          headers += [:moto, :soe]
+        when 3
+          headers += [:moto, :soe, :naka]
+        when 4
+          headers += [:moto, :soe, :naka, :tome]
+        else
+          headers += [:moto, :soe, :naka, :tome]
+          (4...rice_len).each {|i|
+            headers << "#{i}dan"
+          }
+        end
+
+        rows = date_rows
+
+        cells = []
+
+        date = min_date
+        while date<=max_date
+          columns = [date.strftime("%m/%d")]
+
+          row = rows[date]
+          if row
+            koji_len.times {|i|
+              columns << (row.kojis[i]&.text || "")
+            }
+            rice_len.times {|i|
+              columns << (row.rices[i]&.text || "")
+            }
+          else
+            (koji_len + rice_len).times {
+              columns << ""
+            }
+          end
+
+          cells << columns
+
+          date = date.tomorrow
+        end
+
+        {header: headers, cells: cells.transpose}
+      end
+
+      def table
+        data = table_data
+
+        Plotly::Plot.new(
+          data: [{
+            type: :table,
+            header: {
+              values: data[:header]
+            },
+            cells: {
+              values: data[:cells]
+            },
+          }],
+          layout: {
+          }
+        )
+      end
+    end
+  end
+end

data/lib/toji/schedule/date_column.rb

@@ -0,0 +1,30 @@
+module Toji
+  module Schedule
+    class DateColumn
+      attr_reader :events
+
+      def initialize
+        @events = []
+      end
+
+      def <<(event)
+        @events << event
+      end
+      alias_method :add, :<<
+
+      def event_groups
+        @events.group_by {|e|
+          e.group_key
+        }.values
+      end
+
+      def text
+        event_groups.map {|es|
+          name = es.first.product.name
+          weight = "%.17g" % es.map(&:weight).sum
+          "#{name}: #{weight}"
+        }.join("<br>")
+      end
+    end
+  end
+end

data/lib/toji/schedule/date_interval_enumerator.rb

@@ -0,0 +1,45 @@
+module Toji
+  module Schedule
+    class DateIntervalEnumerator
+      include Enumerable
+
+      def initialize(intervals, afterwards)
+        @intervals = intervals
+        @afterwards = afterwards
+      end
+
+      def each(&block)
+        Enumerator.new do |y|
+          y << 0
+          @intervals.each {|interval|
+            y << interval
+          }
+          loop {
+            y << @afterwards
+          }
+        end.each(&block)
+      end
+
+      def merge(dates, length)
+        dates = [dates].flatten
+        enum = each
+
+        length.times {|i|
+          add = enum.next
+
+          if i==0
+            dates[i] = dates[i].to_time
+          elsif Integer===dates[i] && dates[i-1]
+            dates[i] = dates[i-1].since(dates[i].days)
+          elsif !dates[i] && dates[i-1]
+            dates[i] = dates[i-1].since(add.days)
+          else
+            dates[i] = dates[i].to_time
+          end
+        }
+
+        dates
+      end
+    end
+  end
+end

data/lib/toji/schedule/date_row.rb

@@ -0,0 +1,29 @@
+module Toji
+  module Schedule
+    class DateRow
+      attr_reader :date
+      attr_reader :kojis
+      attr_reader :rices
+
+      def initialize(date)
+        @date = date
+        @kojis = []
+        @rices = []
+      end
+
+      def <<(event)
+        case event.type
+        when :koji
+          index = event.group_index
+          @kojis[index] ||= DateColumn.new
+          @kojis[index] << event
+        when :rice
+          index = event.group_index
+          @rices[index] ||= DateColumn.new
+          @rices[index] << event
+        end
+      end
+      alias_method :add, :<<
+    end
+  end
+end

data/lib/toji/schedule/product.rb

@@ -0,0 +1,80 @@
+module Toji
+  module Schedule
+    class Product
+      attr_reader :name
+      attr_reader :description
+      attr_reader :recipe
+
+      attr_reader :koji_dates
+      attr_reader :rice_dates
+
+      attr_reader :color
+
+      def initialize(name, description, recipe, koji_dates, rice_dates, color=nil)
+        @name = name
+        @description = description
+        @recipe = recipe
+
+        @koji_dates = DateIntervalEnumerator.new([], 0).merge(koji_dates, recipe.steps.length)
+        @rice_dates = DateIntervalEnumerator.new([recipe.moto_days, recipe.odori_days+1, 1], 1).merge(rice_dates, recipe.steps.length)
+
+        @color = color
+      end
+
+      def events
+        events = []
+
+        @koji_dates.length.times {|i|
+          events << ProductEvent.new(self, :koji, i)
+        }
+
+        @rice_dates.length
+          .times.map {|i|
+            ProductEvent.new(self, :rice, i)
+          }
+          .delete_if {|e|
+            4<=e.index && e.weight==0
+          }
+          .each {|e|
+            events << e
+          }
+
+        events
+      end
+
+      def self.create(args)
+        if self===args
+          args
+        elsif Hash===args
+          recipe = args.fetch(:recipe)
+          if Symbol===recipe
+            recipe = Recipe::ThreeStepMashing::TEMPLATES.fetch(recipe)
+          end
+          if args[:scale]
+            recipe = recipe.scale(args[:scale])
+          end
+          if args[:round]
+            recipe = recipe.round(args[:round])
+          end
+          if args[:moto_days]
+            recipe.moto_days = args[:moto_days]
+          end
+          if args[:odori_days]
+            recipe.odori_days = args[:odori_days]
+          end
+
+          new(
+            args[:name],
+            args[:description],
+            recipe,
+            args[:koji_dates],
+            args[:rice_dates],
+            args[:color]
+          )
+        else
+          raise "not supported class: #{args.class}"
+        end
+      end
+    end
+  end
+end

data/lib/toji/schedule/product_event.rb

@@ -0,0 +1,44 @@
+module Toji
+  module Schedule
+    class ProductEvent
+      attr_reader :product
+      attr_reader :type
+      attr_reader :index
+      
+      def initialize(product, type, index)
+        @product = product
+        @type = type
+        @index = index
+      end
+
+      def date
+        method = "#{@type}_dates".to_sym
+        @product.send(method)[@index]
+      end
+
+      def group_index
+        method = "#{@type}_dates".to_sym
+        dates = @product.send(method)
+        date = dates[@index]
+
+        if @type==:koji && dates.all? {|d| d==date}
+          1
+        else
+          dates.index(date)
+        end
+      end
+
+      def group_key
+        a = []
+        a << product.name
+        a << type
+        a << group_index
+        a.map(&:to_s).join(":")
+      end
+
+      def weight
+        @product.recipe.steps[@index].send(@type).raw
+      end
+    end
+  end
+end

data/lib/toji/schedule.rb

@@ -0,0 +1,11 @@
+require 'toji/schedule/calendar'
+require 'toji/schedule/product'
+require 'toji/schedule/product_event'
+require 'toji/schedule/date_row'
+require 'toji/schedule/date_column'
+require 'toji/schedule/date_interval_enumerator'
+
+module Toji
+  module Schedule
+  end
+end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/toji.rb

@@ -3,6 +3,7 @@ require 'active_support/all'
 
 require 'toji/recipe'
 require 'toji/brew'
+require 'toji/schedule'
 
 module Toji
   class Error < StandardError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -115,6 +115,7 @@ files:
 - example/moromi.ipynb
 - example/moromi.rb
 - example/rice_recipe.rb
+- example/schedule.ipynb
 - example/shubo.ipynb
 - example/shubo.rb
 - example/three_step_mashing_recipe.rb
@@ -140,7 +141,6 @@ files:
 - lib/toji/recipe/ingredient/koji/base.rb
 - lib/toji/recipe/ingredient/koji/expected.rb
 - lib/toji/recipe/ingredient/koji/expected_fermentable.rb
-- lib/toji/recipe/ingredient/lactic_acid.rb
 - lib/toji/recipe/ingredient/rice.rb
 - lib/toji/recipe/ingredient/rice/actual.rb
 - lib/toji/recipe/ingredient/rice/actual_steamable.rb
@@ -149,7 +149,6 @@ files:
 - lib/toji/recipe/ingredient/rice/expected_steamable.rb
 - lib/toji/recipe/ingredient/yeast.rb
 - lib/toji/recipe/koji_rate.rb
-- lib/toji/recipe/lactic_acid_rate.rb
 - lib/toji/recipe/rice_rate.rb
 - lib/toji/recipe/rice_rate/base.rb
 - lib/toji/recipe/rice_rate/cooked.rb
@@ -157,6 +156,13 @@ files:
 - lib/toji/recipe/step.rb
 - lib/toji/recipe/three_step_mashing.rb
 - lib/toji/recipe/yeast_rate.rb
+- lib/toji/schedule.rb
+- lib/toji/schedule/calendar.rb
+- lib/toji/schedule/date_column.rb
+- lib/toji/schedule/date_interval_enumerator.rb
+- lib/toji/schedule/date_row.rb
+- lib/toji/schedule/product.rb
+- lib/toji/schedule/product_event.rb
 - lib/toji/version.rb
 - toji.gemspec
 homepage: https://github.com/yoshida-eth0/ruby-toji

data/lib/toji/recipe/ingredient/lactic_acid.rb

@@ -1,21 +0,0 @@
-module Toji
-  module Recipe
-    module Ingredient
-      class LacticAcid
-
-        def initialize(total, rate: Recipe::LacticAcidRate::SIMPLE_SOKUJO)
-          @total = total
-          @rate = rate
-        end
-
-        def moto
-          @total * @rate.moto_rate
-        end
-
-        def soe
-          @total * @rate.soe_rate
-        end
-      end
-    end
-  end
-end

data/lib/toji/recipe/lactic_acid_rate.rb

@@ -1,17 +0,0 @@
-module Toji
-  module Recipe
-    class LacticAcidRate
-      attr_reader :moto_rate
-      attr_reader :soe_rate
-
-      def initialize(moto_rate, soe_rate)
-        @moto_rate = moto_rate
-        @soe_rate = soe_rate
-      end
-
-      SOKUJO = new(0.007, 0.0)
-      SIMPLE_SOKUJO = new(0.006, 0.002)
-      KIMOTO = new(0.0, 0.0)
-    end
-  end
-end