toji 2.7.0 → 2.11.0

data/lib/toji/recipe.rb

@@ -1,12 +1,15 @@
 require 'toji/recipe/step'
+require 'toji/recipe/action'
 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
-    attr_accessor :squeeze_interval_days
 
     def scale(rice_total)
       rate = rice_total / steps.map(&:rice_total).sum
@@ -16,9 +19,11 @@ module Toji
 
       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
-        o.squeeze_interval_days = squeeze_interval_days
       }
     end
 
@@ -29,9 +34,11 @@ module Toji
 
       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
-        o.squeeze_interval_days = squeeze_interval_days
       }
     end
 
@@ -45,12 +52,12 @@ module Toji
     end
 
     # 酒母歩合の累計
-    def cumulative_shubo_rates
+    def cumulative_moto_rates
       rice_total = steps.map(&:rice_total)
-      shubo = rice_total.first
+      moto = rice_total.first
 
       rice_total.map.with_index {|x,i|
-        shubo / rice_total[0..i].inject(&:+)
+        moto / rice_total[0..i].inject(&:+)
       }
     end
 
@@ -60,8 +67,8 @@ module Toji
     # 汲水歩合が大きい高温糖化酒母では6%程度である
     #
     # 出典: 酒造教本 P96
-    def shubo_rate
-      cumulative_shubo_rates.last || 0.0
+    def moto_rate
+      cumulative_moto_rates.last || 0.0
     end
 
     # 白米比率
@@ -79,7 +86,7 @@ module Toji
     end
 
     def table_data
-      headers = [""] + steps.map(&:name) + [:total]
+      headers = [""] + steps.map.with_index{|s,i| :"step#{i}"} + [:total]
       keys = [:rice_total, :kake, :koji, :alcohol, :water, :lactic_acid]
 
       cells = [keys]

data/lib/toji/recipe/action.rb

@@ -0,0 +1,8 @@
+module Toji
+  module Recipe
+    module Action
+      attr_accessor :type
+      attr_accessor :interval_days
+    end
+  end
+end

data/lib/toji/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -122,10 +122,9 @@ files:
 - example/moromi.ipynb
 - example/moromi.rb
 - example/moromi.yaml
+- example/moto.rb
+- example/moto.yaml
 - example/recipe.rb
-- example/shubo.ipynb
-- example/shubo.rb
-- example/shubo.yaml
 - lib/toji.rb
 - lib/toji/brew.rb
 - lib/toji/brew/base.rb
@@ -137,12 +136,18 @@ files:
 - lib/toji/brew/graph/progress.rb
 - lib/toji/brew/koji.rb
 - lib/toji/brew/moromi.rb
-- lib/toji/brew/shubo.rb
+- lib/toji/brew/moto.rb
 - lib/toji/brew/state.rb
 - lib/toji/brew/wrapped_state.rb
 - lib/toji/calendar.rb
 - lib/toji/calendar/date_column.rb
 - lib/toji/calendar/date_row.rb
+- lib/toji/event.rb
+- lib/toji/event/action_event.rb
+- lib/toji/event/base.rb
+- lib/toji/event/kake_event.rb
+- lib/toji/event/koji_event.rb
+- lib/toji/event/rice_event.rb
 - lib/toji/ingredient.rb
 - lib/toji/ingredient/kake.rb
 - lib/toji/ingredient/kake/actual.rb
@@ -161,11 +166,10 @@ files:
 - lib/toji/ingredient/rice/expected_steamable.rb
 - 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/product/event_factory.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/ab_expect.rb
+- lib/toji/recipe/action.rb
 - lib/toji/recipe/step.rb
 - lib/toji/version.rb
 - toji.gemspec
@@ -191,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Management tools for brewing japanese sake.

data/example/shubo.ipynb

@@ -1,121 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 1,
-   "metadata": {},
-   "outputs": [
-    {
-     "data": {
-      "text/html": [
-       "\n",
-       "  <script>\n",
-       "  requirejs.config({paths: { 'plotly': ['https://cdn.plot.ly/plotly-latest.min'] }})\n",
-       "  </script>\n",
-       "\n",
-       "\n",
-       "<div id=\"105867eb-e572-490c-8509-e506179e76ad\" style=\"height: 100%; width: 100%;\"></div>\n",
-       "\n",
-       "<script>\n",
-       " require(['plotly'], function(Plotly) { \n",
-       "Plotly.newPlot(\n",
-       "  '105867eb-e572-490c-8509-e506179e76ad',\n",
-       "  [{\"x\":[0.0,3600.0,86400.0,172800.0,172801.0,259200.0,259201.0,345600.0,345601.0,432000.0,518400.0,604800.0,691200.0,777600.0,864000.0,950400.0,1036800.0,1123200.0],\"y\":[12.0,20.0,14.0,8.0,11.0,10.0,13.0,12.0,15.0,14.0,20.0,20.0,20.0,20.0,15.0,12.0,10.0,9.0],\"text\":[\"01/16 00:00\",\"01/16 01:00\",\"01/17 00:00\",\"01/18 00:00\",\"01/18 00:00\",\"01/19 00:00\",\"01/19 00:00\",\"01/20 00:00\",\"01/20 00:00\",\"01/21 00:00\",\"01/22 00:00\",\"01/23 00:00\",\"01/24 00:00\",\"01/25 00:00\",\"01/26 00:00\",\"01/27 00:00\",\"01/28 00:00\",\"01/29 00:00\"],\"name\":\"temps\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[86400.0,172800.0,259200.0,345600.0,432000.0,518400.0,604800.0,691200.0,777600.0,864000.0,950400.0,1036800.0,1123200.0],\"y\":[15.0,16.0,16.5,17.0,17.0,17.0,14.0,12.0,9.0,8.0,7.0,6.0,5.0],\"text\":[\"01/17 00:00\",\"01/18 00:00\",\"01/19 00:00\",\"01/20 00:00\",\"01/21 00:00\",\"01/22 00:00\",\"01/23 00:00\",\"01/24 00:00\",\"01/25 00:00\",\"01/26 00:00\",\"01/27 00:00\",\"01/28 00:00\",\"01/29 00:00\"],\"name\":\"baume\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#9467bd\"}},{\"x\":[0.0,3600.0,86400.0,172800.0,259200.0,345600.0,432000.0,518400.0,604800.0,691200.0,777600.0,864000.0,950400.0,1036800.0,1123200.0],\"y\":[13.0,13.0,13.0,13.0,13.5,13.5,14.0,14.5,15.5,16.0,16.0,16.5,17.0,17.5,17.5],\"text\":[\"01/16 00:00\",\"01/16 01:00\",\"01/17 00:00\",\"01/18 00:00\",\"01/19 00:00\",\"01/20 00:00\",\"01/21 00:00\",\"01/22 00:00\",\"01/23 00:00\",\"01/24 00:00\",\"01/25 00:00\",\"01/26 00:00\",\"01/27 00:00\",\"01/28 00:00\",\"01/29 00:00\"],\"name\":\"acid\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#8c564b\"}}],\n",
-       "  {\"xaxis\":{\"dtick\":86400,\"tickvals\":[0,86400,172800,259200,345600,432000,518400,604800,691200,777600,864000,950400,1036800,1123200],\"ticktext\":[\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"10\",\"11\",\"12\",\"13\",\"14\"]},\"annotations\":[{\"x\":0.0,\"y\":12.0,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"水麹\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":3600.0,\"y\":20.0,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"仕込み\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":86400.0,\"y\":14.0,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"打瀬\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":777600.0,\"y\":20.0,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"分け\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40}]},\n",
-       "  {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
-       ")\n",
-       "\n",
-       "window.addEventListener('resize', function() {\n",
-       "  Plotly.Plots.resize(document.getElementById('105867eb-e572-490c-8509-e506179e76ad'))\n",
-       "})\n",
-       " }) \n",
-       "</script>"
-      ],
-      "text/plain": [
-       "#<Plotly::Offline::HTML:0x00007f983ea69c48 @id=\"105867eb-e572-490c-8509-e506179e76ad\", @data=[{:x=>[0.0, 3600.0, 86400.0, 172800.0, 172801.0, 259200.0, 259201.0, 345600.0, 345601.0, 432000.0, 518400.0, 604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0], :y=>[12.0, 20.0, 14.0, 8.0, 11.0, 10.0, 13.0, 12.0, 15.0, 14.0, 20.0, 20.0, 20.0, 20.0, 15.0, 12.0, 10.0, 9.0], :text=>[\"01/16 00:00\", \"01/16 01:00\", \"01/17 00:00\", \"01/18 00:00\", \"01/18 00:00\", \"01/19 00:00\", \"01/19 00:00\", \"01/20 00:00\", \"01/20 00:00\", \"01/21 00:00\", \"01/22 00:00\", \"01/23 00:00\", \"01/24 00:00\", \"01/25 00:00\", \"01/26 00:00\", \"01/27 00:00\", \"01/28 00:00\", \"01/29 00:00\"], :name=>\"temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[86400.0, 172800.0, 259200.0, 345600.0, 432000.0, 518400.0, 604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0], :y=>[15.0, 16.0, 16.5, 17.0, 17.0, 17.0, 14.0, 12.0, 9.0, 8.0, 7.0, 6.0, 5.0], :text=>[\"01/17 00:00\", \"01/18 00:00\", \"01/19 00:00\", \"01/20 00:00\", \"01/21 00:00\", \"01/22 00:00\", \"01/23 00:00\", \"01/24 00:00\", \"01/25 00:00\", \"01/26 00:00\", \"01/27 00:00\", \"01/28 00:00\", \"01/29 00:00\"], :name=>\"baume\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#9467bd\"}}, {:x=>[0.0, 3600.0, 86400.0, 172800.0, 259200.0, 345600.0, 432000.0, 518400.0, 604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0], :y=>[13.0, 13.0, 13.0, 13.0, 13.5, 13.5, 14.0, 14.5, 15.5, 16.0, 16.0, 16.5, 17.0, 17.5, 17.5], :text=>[\"01/16 00:00\", \"01/16 01:00\", \"01/17 00:00\", \"01/18 00:00\", \"01/19 00:00\", \"01/20 00:00\", \"01/21 00:00\", \"01/22 00:00\", \"01/23 00:00\", \"01/24 00:00\", \"01/25 00:00\", \"01/26 00:00\", \"01/27 00:00\", \"01/28 00:00\", \"01/29 00:00\"], :name=>\"acid\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#8c564b\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800, 259200, 345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200], :ticktext=>[\"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\", \"13\", \"14\"]}, :annotations=>[{:x=>0.0, :y=>12.0, :xref=>\"x\", :yref=>\"y\", :text=>\"水麹\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>3600.0, :y=>20.0, :xref=>\"x\", :yref=>\"y\", :text=>\"仕込み\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>86400.0, :y=>14.0, :xref=>\"x\", :yref=>\"y\", :text=>\"打瀬\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>777600.0, :y=>20.0, :xref=>\"x\", :yref=>\"y\", :text=>\"分け\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "text/html": [
-       "\n",
-       "  <script>\n",
-       "  requirejs.config({paths: { 'plotly': ['https://cdn.plot.ly/plotly-latest.min'] }})\n",
-       "  </script>\n",
-       "\n",
-       "\n",
-       "<div id=\"23560ab9-b0dc-4006-9779-b9219ab608c6\" style=\"height: 100%; width: 100%;\"></div>\n",
-       "\n",
-       "<script>\n",
-       " require(['plotly'], function(Plotly) { \n",
-       "Plotly.newPlot(\n",
-       "  '23560ab9-b0dc-4006-9779-b9219ab608c6',\n",
-       "  [{\"type\":\"table\",\"header\":{\"values\":[\"day_label\",\"display_time\",\"mark\",\"temps\",\"display_baume\",\"acid\",\"warmings\"]},\"cells\":{\"values\":[[\"1\",\"1\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"10\",\"11\",\"12\",\"13\",\"14\"],[\"01/16 00:00\",\"01/16 01:00\",\"01/17 00:00\",\"01/18 00:00\",\"01/19 00:00\",\"01/20 00:00\",\"01/21 00:00\",\"01/22 00:00\",\"01/23 00:00\",\"01/24 00:00\",\"01/25 00:00\",\"01/26 00:00\",\"01/27 00:00\",\"01/28 00:00\",\"01/29 00:00\"],[\"水麹\",\"仕込み\",\"打瀬\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"分け\",\"\",\"\",\"\",\"\"],[\"12.0\",\"20.0\",\"14.0\",\"8.0, 11.0\",\"10.0, 13.0\",\"12.0, 15.0\",\"14.0\",\"20.0\",\"20.0\",\"20.0\",\"20.0\",\"15.0\",\"12.0\",\"10.0\",\"9.0\"],[\"\",\"\",15.0,16.0,16.5,17.0,17.0,17.0,14.0,12.0,9.0,8.0,7.0,6.0,5.0],[13.0,13.0,13.0,13.0,13.5,13.5,14.0,14.5,15.5,16.0,16.0,16.5,17.0,17.5,17.5],[\"\",\"\",\"\",\"暖気\",\"暖気\",\"暖気\",\"行火\",\"行火\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"]]}}],\n",
-       "  {\"height\":650},\n",
-       "  {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
-       ")\n",
-       "\n",
-       "window.addEventListener('resize', function() {\n",
-       "  Plotly.Plots.resize(document.getElementById('23560ab9-b0dc-4006-9779-b9219ab608c6'))\n",
-       "})\n",
-       " }) \n",
-       "</script>"
-      ],
-      "text/plain": [
-       "#<Plotly::Offline::HTML:0x00007f9841041718 @id=\"23560ab9-b0dc-4006-9779-b9219ab608c6\", @data=[{:type=>:table, :header=>{:values=>[:day_label, :display_time, :mark, :temps, :display_baume, :acid, :warmings]}, :cells=>{:values=>[[\"1\", \"1\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\", \"13\", \"14\"], [\"01/16 00:00\", \"01/16 01:00\", \"01/17 00:00\", \"01/18 00:00\", \"01/19 00:00\", \"01/20 00:00\", \"01/21 00:00\", \"01/22 00:00\", \"01/23 00:00\", \"01/24 00:00\", \"01/25 00:00\", \"01/26 00:00\", \"01/27 00:00\", \"01/28 00:00\", \"01/29 00:00\"], [\"水麹\", \"仕込み\", \"打瀬\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"分け\", \"\", \"\", \"\", \"\"], [\"12.0\", \"20.0\", \"14.0\", \"8.0, 11.0\", \"10.0, 13.0\", \"12.0, 15.0\", \"14.0\", \"20.0\", \"20.0\", \"20.0\", \"20.0\", \"15.0\", \"12.0\", \"10.0\", \"9.0\"], [\"\", \"\", 15.0, 16.0, 16.5, 17.0, 17.0, 17.0, 14.0, 12.0, 9.0, 8.0, 7.0, 6.0, 5.0], [13.0, 13.0, 13.0, 13.0, 13.5, 13.5, 14.0, 14.5, 15.5, 16.0, 16.0, 16.5, 17.0, 17.5, 17.5], [\"\", \"\", \"\", \"暖気\", \"暖気\", \"暖気\", \"行火\", \"行火\", \"\", \"\", \"\", \"\", \"\", \"\", \"\"]]}}], @layout={:height=>650}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
-      ]
-     },
-     "metadata": {},
-     "output_type": "display_data"
-    },
-    {
-     "data": {
-      "text/plain": [
-       "#<CZTop::Socket::PUB:0x7f984321b6b0 last_endpoint=\"tcp://127.0.0.1:56600\">"
-      ]
-     },
-     "execution_count": 1,
-     "metadata": {},
-     "output_type": "execute_result"
-    }
-   ],
-   "source": [
-    "$LOAD_PATH << File.dirname(__FILE__) + \"/../lib\"\n",
-    "require 'toji'\n",
-    "require './example_core'\n",
-    "require 'rbplotly'\n",
-    "\n",
-    "shubo = Example::Brew::Shubo.load_yaml_file(\"shubo.yaml\")\n",
-    "shubo.progress.plot.show\n",
-    "shubo.progress.table.tap {|t|\n",
-    "  t.layout.height = 650\n",
-    "}.show"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  }
- ],
- "metadata": {
-  "kernelspec": {
-   "display_name": "Ruby 2.7.1",
-   "language": "ruby",
-   "name": "ruby"
-  },
-  "language_info": {
-   "file_extension": ".rb",
-   "mimetype": "application/x-ruby",
-   "name": "ruby",
-   "version": "2.6.3"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}

data/lib/toji/product/event.rb

@@ -1,13 +0,0 @@
-module Toji
-  module Product
-    class Event
-      attr_reader :date
-      attr_reader :type
-
-      def initialize(date, type)
-        @date = date
-        @type = type
-      end
-    end
-  end
-end

data/lib/toji/product/rice_event.rb

@@ -1,28 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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