toji 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 230074f3cfc1c17026ac87d7c6ccd0268a75f4dc5fe23e2c3fceaffc3c7dd426
-  data.tar.gz: 82e735ce458faced833dc0c1c40443a43d0d486e9663837d7040388336a7f3db
+  metadata.gz: 429e9eeeffb945a1a475dd46b905218bb37957949f546dbe397340cd676126ec
+  data.tar.gz: ba6ce92d393d67ba66454f8d15d9f7f7aaf2ca652be94480c8e7770198357a3d
 SHA512:
-  metadata.gz: cda9a70705ef31fcfd903f00f217038e048a4a85f8253895d14050b97cf61984151077f718a635102b07f766a0a7ad79ab413e4b76baa37177305cccb0ffe271
-  data.tar.gz: cfe743bbc06280ecfb41a0d208b959efcff8c69d757cbafde3595cd7278a825f5971c76f6ee5dc114e0d8b645d7903972024d5d415117349ad15bea4a3ae9ae8
+  metadata.gz: 34139f9cb7e87b8f7a55fad1ffea779dfcf17a1c4575e2f59d49e50c4930691886a3853fe4ed9c408c60740b28fcde5ce347b358d9919c1a8e5faf1a94d37dbb
+  data.tar.gz: ae9df3f15afc81b8b4c239d2f0d18ee5c77bc293327aae8c1cee44dad98948a6abde97c498df83b3a3d0a29a44c015e25f5c88969425d345e21516911018eb00

data/lib/toji/calendar.rb

@@ -16,7 +16,7 @@ module Toji
     alias_method :add, :<<
 
     def date_rows
-      events = @products.map{|product| product.events}.flatten
+      events = @products.map{|product| product.rice_events}.flatten
 
       result = {}
       events.each {|event|
@@ -28,7 +28,7 @@ module Toji
     end
 
     def table_data
-      events = @products.map{|product| product.events}.flatten
+      events = @products.map{|product| product.rice_events}.flatten
 
       koji_len = events.select{|e| e.type==:koji}.map(&:group_index).max + 1
       kake_len = events.select{|e| e.type==:kake}.map(&:group_index).max + 1

data/lib/toji/calendar/date_column.rb

@@ -1,19 +1,19 @@
 module Toji
   class Calendar
     class DateColumn
-      attr_reader :events
+      attr_reader :rice_events
 
       def initialize
-        @events = []
+        @rice_events = []
       end
 
       def <<(event)
-        @events << event
+        @rice_events << event
       end
       alias_method :add, :<<
 
       def event_groups
-        @events.group_by {|e|
+        @rice_events.group_by {|e|
           e.group_key
         }.values
       end

data/lib/toji/product.rb

@@ -1,4 +1,6 @@
 require 'toji/product/event'
+require 'toji/product/rice_event'
+require 'toji/product/rice_event_group'
 
 module Toji
   module Product
@@ -21,45 +23,75 @@ module Toji
       }
     end
 
-    def events
-      events = []
+    def squeeze_date
+      base_date.next_day(recipe.squeeze_interval_days)
+    end
 
-      koji_dates.length.times {|i|
-        events << Event.new(self, :koji, i)
+    def koji_events
+      koji_dates.map.with_index {|date,i|
+        RiceEvent.new(
+          product: self,
+          type: :koji,
+          index: i,
+          group_index: koji_dates.find_index(date),
+          date: date,
+          weight: recipe.steps[i].koji,
+        )
       }
+    end
 
-      kake_dates.length
-        .times.map {|i|
-          Event.new(self, :kake, i)
-        }
-        .delete_if {|e|
-          4<=e.index && e.weight==0
-        }
-        .each {|e|
-          events << e
-        }
+    def kake_events
+      kake_dates.map.with_index {|date,i|
+        RiceEvent.new(
+          product: self,
+          type: :kake,
+          index: i,
+          group_index: kake_dates.find_index(date),
+          date: date,
+          weight: recipe.steps[i].kake,
+        )
+      }
+    end
 
-      events
+    def rice_events
+      koji_events + kake_events
     end
 
-    def events_group
-      events.group_by{|event|
+    def koji_event_groups
+      koji_events.group_by{|event|
         event.group_key
       }.map {|group_key,events|
-        breakdown = events.map {|event|
-          {index: event.index, weight: event.weight}
-        }
-        if 1<breakdown.length
-          breakdown = breakdown.select{|event| 0<event[:weight]}
-        end
+        events.select{|event| 0<event.weight}
+      }.select {|events|
+        0<events.length
+      }.map {|events|
+        RiceEventGroup.new(events)
+      }
+    end
 
-        {
-          date: events.first.date,
-          type: events.first.type,
-          weight: events.map(&:weight).sum,
-          breakdown: breakdown,
-        }
+    def kake_event_groups
+      kake_events.group_by{|event|
+        event.group_key
+      }.map {|group_key,events|
+        events.select{|event| 0<event.weight}
+      }.select {|events|
+        0<events.length
+      }.map {|events|
+        RiceEventGroup.new(events)
       }
     end
+
+    def rice_event_groups
+      koji_event_groups + kake_event_groups
+    end
+
+    def events
+      events = []
+
+      events += rice_event_groups
+      events << Event.new(squeeze_date, :squeeze)
+
+      events
+    end
   end
 end

data/lib/toji/product/event.rb

@@ -1,43 +1,12 @@
 module Toji
   module Product
     class Event
-      attr_reader :product
+      attr_reader :date
       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.reduce_key
-        a << type
-        a << group_index
-        a.map(&:to_s).join(":")
-      end
-
-      def weight
-        @product.recipe.steps[@index].send(@type)
+      def initialize(date, type)
+        @date = date
+        @type = type
       end
     end
   end

data/lib/toji/product/rice_event.rb

@@ -0,0 +1,28 @@
+require 'toji/product/event'
+
+module Toji
+  module Product
+    class RiceEvent < Event
+      attr_reader :product
+      attr_reader :index
+      attr_reader :group_index
+      attr_reader :weight
+      
+      def initialize(product:, type:, index:, group_index:, date:, weight:)
+        super(date, type)
+        @product = product
+        @index = index
+        @group_index = group_index
+        @weight = weight
+      end
+
+      def group_key
+        a = []
+        a << product.reduce_key
+        a << type
+        a << group_index
+        a.map(&:to_s).join(":")
+      end
+    end
+  end
+end

data/lib/toji/product/rice_event_group.rb

@@ -0,0 +1,19 @@
+require 'toji/product/event'
+
+module Toji
+  module Product
+    class RiceEventGroup < Event
+      attr_reader :breakdown
+
+      def initialize(events)
+        o = events.first
+        super(o&.date, o&.type)
+        @breakdown = events
+      end
+
+      def weight
+        @breakdown.map(&:weight).sum
+      end
+    end
+  end
+end

data/lib/toji/recipe.rb

@@ -6,6 +6,7 @@ module Toji
     attr_accessor :steps
     attr_accessor :ab_coef
     attr_accessor :ab_expects
+    attr_accessor :squeeze_interval_days
 
     def scale(rice_total)
       rate = rice_total / steps.map(&:rice_total).sum
@@ -15,6 +16,9 @@ module Toji
 
       self.class.new.tap {|o|
         o.steps = new_steps
+        o.ab_coef = ab_coef
+        o.ab_expects = ab_expects.deep_dup
+        o.squeeze_interval_days = squeeze_interval_days
       }
     end
 
@@ -25,6 +29,9 @@ module Toji
 
       self.class.new.tap {|o|
         o.steps = new_steps
+        o.ab_coef = ab_coef
+        o.ab_expects = ab_expects.deep_dup
+        o.squeeze_interval_days = squeeze_interval_days
       }
     end
 

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,6 +162,8 @@ files:
 - lib/toji/ingredient/rice_rate.rb
 - lib/toji/product.rb
 - lib/toji/product/event.rb
+- lib/toji/product/rice_event.rb
+- lib/toji/product/rice_event_group.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/ab_expect.rb
 - lib/toji/recipe/step.rb