toji 2.12.0 → 2.13.0

data/example/{moromi.rb → moromi_progress.rb}

@@ -1,14 +1,15 @@
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require 'toji'
 require_relative 'example_core'
 require 'terminal-table'
 
 
-moromi = Example::Brew::Moromi.load_yaml_file(File.dirname(__FILE__)+"/moromi.yaml")
+moromi = Example::Progress::MoromiProgress.load_yaml_file(File.dirname(__FILE__)+"/moromi_progress.yaml")
 
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "操作室温", "ボーメ及び日本酒度", "アルコール度数", "BMD", "アルコール期待値(16.5 +3)", "経過時間", "日時"]
   t << :separator
-  moromi.wrapped_states.each {|s|
+  moromi.states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.room_temp, s.display_baume, s.alcohol, s.bmd&.round(2), s.expected_alcohol(16.5, +3, 1.5)&.round(2), s.elapsed_time, s.display_time]
   }

data/example/moto_progress.ipynb

@@ -0,0 +1,121 @@
+{
+ "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=\"9d0ee2a7-322e-41db-838e-dfe6129038ea\" style=\"height: 100%; width: 100%;\"></div>\n",
+       "\n",
+       "<script>\n",
+       " require(['plotly'], function(Plotly) { \n",
+       "Plotly.newPlot(\n",
+       "  '9d0ee2a7-322e-41db-838e-dfe6129038ea',\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('9d0ee2a7-322e-41db-838e-dfe6129038ea'))\n",
+       "})\n",
+       " }) \n",
+       "</script>"
+      ],
+      "text/plain": [
+       "#<Plotly::Offline::HTML:0x00007fe9601f3cf8 @id=\"9d0ee2a7-322e-41db-838e-dfe6129038ea\", @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=\"eda34d57-4ce4-4676-8f40-05b48811023e\" style=\"height: 100%; width: 100%;\"></div>\n",
+       "\n",
+       "<script>\n",
+       " require(['plotly'], function(Plotly) { \n",
+       "Plotly.newPlot(\n",
+       "  'eda34d57-4ce4-4676-8f40-05b48811023e',\n",
+       "  [{\"type\":\"table\",\"header\":{\"values\":[\"day_label\",\"display_time\",\"mark\",\"temps\",\"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('eda34d57-4ce4-4676-8f40-05b48811023e'))\n",
+       "})\n",
+       " }) \n",
+       "</script>"
+      ],
+      "text/plain": [
+       "#<Plotly::Offline::HTML:0x00007fe9639b2838 @id=\"eda34d57-4ce4-4676-8f40-05b48811023e\", @data=[{:type=>:table, :header=>{:values=>[:day_label, :display_time, :mark, :temps, :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:0x7fe965404080 last_endpoint=\"tcp://127.0.0.1:58100\">"
+      ]
+     },
+     "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",
+    "moto = Example::Progress::MotoProgress.load_yaml_file(\"moto_progress.yaml\")\n",
+    "moto.progress_note.plot.show\n",
+    "moto.progress_note.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/example/{moto.rb → moto_progress.rb}

@@ -1,13 +1,14 @@
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require 'toji'
 require_relative 'example_core'
 require 'terminal-table'
 
-moto = Example::Brew::Moto.load_yaml_file(File.dirname(__FILE__)+"/moto.yaml")
+moto = Example::Progress::MotoProgress.load_yaml_file(File.dirname(__FILE__)+"/moto_progress.yaml")
 
 table = Terminal::Table.new do |t|
   t << ["作業", "日数", "品温(度)", "ボーメ", "酸度", "経過時間", "日時"]
   t << :separator
-  moto.wrapped_states.each {|s|
+  moto.states.each {|s|
     temp = s.temps.map(&:to_s).join(" / ")
     t << [s.mark, s.day_label, temp, s.baume, s.acid, s.elapsed_time, s.display_time]
   }

data/example/{moto.yaml → moto_progress.yaml}

@@ -1,76 +1,75 @@
 date_line: 0
 states:
 - time: 2019-01-16
-  elapsed_time: 0
   mark: 水麹
   temps: 12.0
   acid: 13.0
-- elapsed_time: 3600
+- time: 2019-01-16 01:00
   mark: 仕込み
   temps: 20.0
   acid: 13.0
-- elapsed_time: 86400
+- time: 2019-01-17
   mark: 打瀬
   temps: 14.0
   baume: 15.0
   acid: 13.0
-- elapsed_time: 172800
+- time: 2019-01-18
   temps:
   - 8.0
   - 11.0
   baume: 16.0
   acid: 13.0
   warmings: 暖気
-- elapsed_time: 259200
+- time: 2019-01-19
   temps:
   - 10.0
   - 13.0
   baume: 16.5
   acid: 13.5
   warmings: 暖気
-- elapsed_time: 345600
+- time: 2019-01-20
   temps:
   - 12.0
   - 15.0
   baume: 17.0
   acid: 13.5
   warmings: 暖気
-- elapsed_time: 432000
+- time: 2019-01-21
   temps: 14.0
   baume: 17.0
   acid: 14.0
   warmings: 行火
-- elapsed_time: 518400
+- time: 2019-01-22
   temps: 20.0
   baume: 17.0
   acid: 14.5
   warmings: 行火
-- elapsed_time: 604800
+- time: 2019-01-23
   temps: 20.0
   baume: 14.0
   acid: 15.5
-- elapsed_time: 691200
+- time: 2019-01-24
   temps: 20.0
   baume: 12.0
   acid: 16.0
-- elapsed_time: 777600
+- time: 2019-01-25
   mark: 分け
   temps: 20.0
   baume: 9.0
   acid: 16.0
-- elapsed_time: 864000
+- time: 2019-01-26
   temps: 15.0
   baume: 8.0
   acid: 16.5
-- elapsed_time: 950400
+- time: 2019-01-27
   temps: 12.0
   baume: 7.0
   acid: 17.0
-- elapsed_time: 1036800
+- time: 2019-01-28
   temps: 10.0
   baume: 6.0
   acid: 17.5
-- elapsed_time: 1123200
+- time: 2019-01-29
   temps: 9.0
   baume: 5.0
   acid: 17.5

data/example/recipe.rb

@@ -1,34 +1,33 @@
+$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
 require 'toji'
 require_relative 'example_core'
 require 'terminal-table'
 
-recipe = Example::Recipe::TEMPLATES[:sokujo_nada].scale(900).round(2)
-step_names = recipe.steps.map(&:name)
+recipe = Example::Recipe::TEMPLATES[:sokujo_nada].scale_rice_total(900).round(2)
+step_names = ["酛", "添", "仲", "留", "四段"].slice(0, recipe.steps.length)
 
 table = Terminal::Table.new do |t|
   t << [""] + step_names
   t << :separator
   t << ["[原料]"]
-  t << ["酵母(g or 本)"] + recipe.steps.map(&:yeast)
-  t << ["乳酸(ml)"] + recipe.steps.map(&:lactic_acid)
-  t << ["掛米(g)"] + recipe.steps.map(&:kake)
-  t << ["麹米(g)"] + recipe.steps.map(&:koji)
-  t << ["汲水(ml)"] + recipe.steps.map(&:water)
-  t << ["醸造アルコール(ml)"] + recipe.steps.map(&:alcohol)
+  t << ["酵母(g or 本)"] + recipe.steps.map{|s| s.yeasts.map(&:weight).sum}
+  t << ["乳酸(ml)"] + recipe.steps.map{|s| s.lactic_acids.map(&:weight).sum}
+  t << ["掛米(g)"] + recipe.steps.map(&:kake_total)
+  t << ["麹米(g)"] + recipe.steps.map(&:koji_total)
+  t << ["汲水(ml)"] + recipe.steps.map(&:water_total)
+  t << ["醸造アルコール(ml)"] + recipe.steps.map{|s| s.alcohols.map(&:weight).sum}
   t << :separator
   t << ["[合計]"]
   t << ["総米(g)"] + recipe.steps.map(&:rice_total)
-  t << ["麹歩合(%)"] + recipe.steps.map{|s| s.koji_rate * 100}.map{|v| v&.round(2)}
-  t << ["汲水歩合(%)"] + recipe.steps.map{|s| s.water_rate * 100}.map{|v| v&.round(2)}
+  t << ["麹歩合(%)"] + recipe.steps.map{|s| s.koji_ratio * 100}.map{|v| v&.round(2)}
+  t << ["汲水歩合(%)"] + recipe.steps.map{|s| s.water_ratio * 100}.map{|v| v&.round(2)}
   t << :separator
   t << ["[累計]"]
   t << ["総米(g)"] + recipe.cumulative_rice_totals
-  t << ["白米比率"] + recipe.rice_rates.map{|v| v&.round(2)}
-  t << ["酒母歩合(%)"] + recipe.cumulative_moto_rates.map{|s| s * 100}.map{|v| v&.round(2)}
+  t << ["白米比率"] + recipe.rice_ratios.map{|v| v&.round(2)}
+  t << ["酒母歩合(%)"] + recipe.cumulative_moto_ratios.map{|s| s * 100}.map{|v| v&.round(2)}
   t << ["タンク内容量(ml)"] + recipe.steps.map {|s|
-    kake = Toji::Ingredient::Kake::Expected.create(s.kake)
-    koji = Toji::Ingredient::Koji::Expected.create(s.koji)
-    s.yeast.to_f + s.lactic_acid.to_f + kake.steamed.to_f + koji.dekoji.to_f + s.water.to_f + s.alcohol.to_f
+    s.yeasts.map(&:weight).sum + s.lactic_acids.map(&:weight).sum + s.kakes.map(&:steamed).sum + s.kojis.map(&:dekoji).sum + s.waters.map(&:weight).sum + s.alcohols.map(&:weight).sum
   }.then {|a|
     sum = 0.0
     a.map {|x| sum += x}
@@ -40,43 +39,56 @@ puts
 
 puts "掛米"
 table = Terminal::Table.new do |t|
-  kakes = recipe.steps.map {|step|
-    Toji::Ingredient::Kake::Expected.create(step.kake)
+  kakes = recipe.steps.map.with_index {|step,i|
+    [i, step.kakes[0]]
+  }.select {|a|
+    a[1]
   }
+  indexes = kakes.map(&:first)
+  kakes = kakes.map(&:last)
 
-  t << ["工程", "原料"] + step_names
+  t << ["工程", "状態"] + indexes.map{|i| step_names[i]}
   t << :separator
-  t << ["洗米・浸漬", "白米(g)"] + kakes.map(&:raw).map{|v| v&.round(2)}
-  t << ["", "吸水増加量(ml)"] + kakes.map(&:soaking_water).map{|v| v&.round(2)}
+  t << ["", "白米(g)"] + kakes.map(&:weight).map{|v| v&.round(2)}
   t << :separator
-  t << ["水切り", "浸漬米(g)"] + kakes.map(&:soaked).map{|v| v&.round(2)}
-  t << ["", "汲水(ml)"] + kakes.map(&:steaming_water).map{|v| v&.round(2)}
+  t << ["洗米・浸漬", "浸漬米(g)"] + kakes.map(&:soaked).map{|v| v&.round(2)}
+  t << ["", "浸漬米吸水率"] + kakes.map(&:soaking_ratio).map{|v| v&.round(2)}
   t << :separator
   t << ["蒸し", "蒸米(g)"] + kakes.map(&:steamed).map{|v| v&.round(2)}
+  t << ["", "蒸米吸水率"] + kakes.map(&:steaming_ratio).map{|v| v&.round(2)}
+  t << :separator
+  t << ["放冷", "蒸米(g)"] + kakes.map(&:cooled).map{|v| v&.round(2)}
+  t << ["", "蒸米吸水率"] + kakes.map(&:cooling_ratio).map{|v| v&.round(2)}
 end
 puts table
 puts
 
 puts "麹"
 table = Terminal::Table.new do |t|
-  kojis = recipe.steps.map {|step|
-    Toji::Ingredient::Koji::Expected.create(step.koji)
+  kojis = recipe.steps.map.with_index {|step,i|
+    [i, step.kojis[0]]
+  }.select {|a|
+    a[1]
   }
+  indexes = kojis.map(&:first)
+  kojis = kojis.map(&:last)
 
-  t << ["工程", "原料"] + step_names
+  t << ["工程", "状態"] + indexes.map{|i| step_names[i]}
   t << :separator
-  t << ["洗米・浸漬", "白米(g)"] + kojis.map(&:raw).map{|v| v&.round(2)}
-  t << ["", "吸水増加量(ml)"] + kojis.map(&:soaking_water).map{|v| v&.round(2)}
+  t << ["", "白米(g)"] + kojis.map(&:weight).map{|v| v&.round(2)}
   t << :separator
-  t << ["水切り", "浸漬米(g)"] + kojis.map(&:soaked).map{|v| v&.round(2)}
-  t << ["", "汲水(ml)"] + kojis.map(&:steaming_water).map{|v| v&.round(2)}
+  t << ["洗米・浸漬", "浸漬米(g)"] + kojis.map(&:soaked).map{|v| v&.round(2)}
+  t << ["", "浸漬米吸水率"] + kojis.map(&:soaking_ratio).map{|v| v&.round(2)}
   t << :separator
   t << ["蒸し", "蒸米(g)"] + kojis.map(&:steamed).map{|v| v&.round(2)}
+  t << ["", "蒸米吸水率"] + kojis.map(&:steaming_ratio).map{|v| v&.round(2)}
   t << :separator
-  t << ["放冷・引込み", "蒸米(g)"] + kojis.map(&:cooled).map{|v| v&.round(2)}
-  t << ["", "種麹(g)"] + kojis.map(&:tanekoji).map{|v| v&.round(2)}
+  t << ["放冷・引き込み", "蒸米(g)"] + kojis.map(&:cooled).map{|v| v&.round(2)}
+  t << ["", "蒸米吸水率"] + kojis.map(&:cooling_ratio).map{|v| v&.round(2)}
+  t << ["", "種麹(g)"] + kojis.map{|k| k.tanekojis.map(&:weight).sum}.map{|v| v&.round(2)}
   t << :separator
-  t << ["製麹", "麹(g)"] + kojis.map(&:dekoji).map{|v| v&.round(2)}
+  t << ["出麹", "麹(g)"] + kojis.map(&:dekoji).map{|v| v&.round(2)}
+  t << ["", "出麹歩合"] + kojis.map(&:dekoji_ratio).map{|v| v&.round(2)}
 end
 puts table
 puts

data/lib/toji.rb

@@ -4,10 +4,12 @@ require 'yaml'
 
 require 'toji/ingredient'
 require 'toji/recipe'
-require 'toji/brew'
+require 'toji/progress'
 require 'toji/calendar'
-require 'toji/event'
+require 'toji/schedule'
 require 'toji/product'
+require 'toji/processing'
+require 'toji/utils'
 
 module Toji
   class Error < StandardError; end

data/lib/toji/calendar.rb

@@ -16,26 +16,26 @@ module Toji
     alias_method :add, :<<
 
     def date_rows
-      events = @products.map{|product| product.rice_events}.flatten
+      schedules = @products.map{|product| product.rice_schedules}.flatten
 
       result = {}
-      events.each {|event|
-        result[event.date] ||= DateRow.new(event.date)
-        result[event.date] << event
+      schedules.each {|schedule|
+        result[schedule.date] ||= DateRow.new(schedule.date)
+        result[schedule.date] << schedule
       }
 
       result
     end
 
     def table_data
-      koji_events = @products.map{|product| product.koji_events}.flatten
-      kake_events = @products.map{|product| product.kake_events}.flatten
-      events = koji_events + kake_events
-
-      koji_len = koji_events.map(&:group_index).max + 1
-      kake_len = kake_events.map(&:group_index).max + 1
-      min_date = events.map(&:date).min
-      max_date = events.map(&:date).max
+      koji_schedules = @products.map{|product| product.koji_schedules}.flatten
+      kake_schedules = @products.map{|product| product.kake_schedules}.flatten
+      schedules = koji_schedules + kake_schedules
+
+      koji_len = koji_schedules.map{|schedule| schedule.step_indexes.first}.max + 1
+      kake_len = kake_schedules.map{|schedule| schedule.step_indexes.first}.max + 1
+      min_date = schedules.map(&:date).min
+      max_date = schedules.map(&:date).max
 
       headers = [:date]
 

data/lib/toji/calendar/date_column.rb

@@ -1,22 +1,22 @@
 module Toji
   class Calendar
     class DateColumn
-      attr_reader :rice_events
+      attr_reader :rice_schedules
 
       def initialize
-        @rice_events = []
+        @rice_schedules = []
       end
 
-      def <<(event)
-        @rice_events << event
+      def <<(schedule)
+        @rice_schedules << schedule
       end
       alias_method :add, :<<
 
       def text
-        @rice_events.map {|ev|
-          name = ev.product.name
-          raw = "%.17g" % ev.raw
-          "#{name}: #{raw}"
+        @rice_schedules.map {|schedule|
+          name = schedule.product.name
+          weight = "%.17g" % schedule.expect.weight
+          "#{name}: #{weight}"
         }.join("<br>")
       end
     end