toji 2.12.0 → 2.13.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (106) hide show
  1. checksums.yaml +4 -4
  2. data/example/calendar.ipynb +42 -51
  3. data/example/calendar.yaml +6 -6
  4. data/example/calendar_file.ipynb +35 -35
  5. data/example/example_core.rb +850 -230
  6. data/example/kake_ingredient.rb +21 -15
  7. data/example/koji_ingredient.rb +31 -21
  8. data/example/{koji_making.ipynb → koji_progress.ipynb} +14 -14
  9. data/example/{koji_making.rb → koji_progress.rb} +3 -2
  10. data/example/{koji_making.yaml → koji_progress.yaml} +8 -9
  11. data/example/{koji_making_multi.ipynb → koji_progress_multi.ipynb} +21 -22
  12. data/example/{moromi.ipynb → moromi_progress.ipynb} +22 -22
  13. data/example/{moromi.rb → moromi_progress.rb} +3 -2
  14. data/example/{moromi.yaml → moromi_progress.yaml} +0 -0
  15. data/example/moto_progress.ipynb +121 -0
  16. data/example/{moto.rb → moto_progress.rb} +3 -2
  17. data/example/{moto.yaml → moto_progress.yaml} +14 -15
  18. data/example/recipe.rb +44 -32
  19. data/lib/toji.rb +4 -2
  20. data/lib/toji/calendar.rb +12 -12
  21. data/lib/toji/calendar/date_column.rb +8 -8
  22. data/lib/toji/calendar/date_row.rb +6 -6
  23. data/lib/toji/ingredient.rb +6 -2
  24. data/lib/toji/ingredient/alcohol.rb +14 -0
  25. data/lib/toji/ingredient/base.rb +11 -0
  26. data/lib/toji/ingredient/kake.rb +3 -9
  27. data/lib/toji/ingredient/koji.rb +19 -10
  28. data/lib/toji/ingredient/lactic_acid.rb +14 -0
  29. data/lib/toji/ingredient/rice.rb +50 -4
  30. data/lib/toji/ingredient/tanekoji.rb +29 -0
  31. data/lib/toji/ingredient/water.rb +18 -0
  32. data/lib/toji/ingredient/yeast.rb +20 -0
  33. data/lib/toji/processing.rb +18 -0
  34. data/lib/toji/processing/base.rb +7 -0
  35. data/lib/toji/processing/cooled_rice.rb +22 -0
  36. data/lib/toji/processing/cooled_rice_element.rb +8 -0
  37. data/lib/toji/processing/dekoji.rb +22 -0
  38. data/lib/toji/processing/dekoji_element.rb +8 -0
  39. data/lib/toji/processing/kake_processing.rb +7 -0
  40. data/lib/toji/processing/koji_processing.rb +10 -0
  41. data/lib/toji/processing/rice_processing.rb +19 -0
  42. data/lib/toji/processing/soaked_rice.rb +49 -0
  43. data/lib/toji/processing/soaked_rice_element.rb +18 -0
  44. data/lib/toji/processing/steamed_rice.rb +22 -0
  45. data/lib/toji/processing/steamed_rice_element.rb +8 -0
  46. data/lib/toji/product.rb +11 -32
  47. data/lib/toji/product/schedule_factory.rb +74 -0
  48. data/lib/toji/progress.rb +23 -0
  49. data/lib/toji/progress/base_progress.rb +37 -0
  50. data/lib/toji/progress/base_state.rb +39 -0
  51. data/lib/toji/progress/builder.rb +53 -0
  52. data/lib/toji/progress/graph.rb +11 -0
  53. data/lib/toji/{brew → progress}/graph/ab.rb +4 -4
  54. data/lib/toji/{brew → progress}/graph/bmd.rb +2 -2
  55. data/lib/toji/{brew/graph/multi_progress.rb → progress/graph/multi_progress_note.rb} +11 -11
  56. data/lib/toji/{brew/graph/progress.rb → progress/graph/progress_note.rb} +20 -18
  57. data/lib/toji/progress/koji_progress.rb +15 -0
  58. data/lib/toji/progress/koji_state.rb +23 -0
  59. data/lib/toji/{brew/moromi.rb → progress/moromi_progress.rb} +9 -5
  60. data/lib/toji/progress/moromi_state.rb +77 -0
  61. data/lib/toji/progress/moto_progress.rb +15 -0
  62. data/lib/toji/progress/moto_state.rb +31 -0
  63. data/lib/toji/progress/progress.rb +15 -0
  64. data/lib/toji/progress/state.rb +9 -0
  65. data/lib/toji/progress/state/baume_to_nihonshudo.rb +21 -0
  66. data/lib/toji/progress/state/nihonshudo_to_baume.rb +21 -0
  67. data/lib/toji/recipe.rb +53 -39
  68. data/lib/toji/recipe/ab_expect.rb +2 -2
  69. data/lib/toji/recipe/action.rb +2 -2
  70. data/lib/toji/recipe/step.rb +97 -71
  71. data/lib/toji/schedule.rb +5 -0
  72. data/lib/toji/schedule/action_schedule.rb +9 -0
  73. data/lib/toji/{event → schedule}/base.rb +1 -1
  74. data/lib/toji/schedule/kake_schedule.rb +11 -0
  75. data/lib/toji/schedule/koji_schedule.rb +11 -0
  76. data/lib/toji/schedule/rice_schedule.rb +16 -0
  77. data/lib/toji/utils.rb +43 -0
  78. data/lib/toji/version.rb +1 -1
  79. metadata +58 -44
  80. data/lib/toji/brew.rb +0 -18
  81. data/lib/toji/brew/base.rb +0 -55
  82. data/lib/toji/brew/builder.rb +0 -98
  83. data/lib/toji/brew/graph.rb +0 -11
  84. data/lib/toji/brew/koji.rb +0 -11
  85. data/lib/toji/brew/moto.rb +0 -11
  86. data/lib/toji/brew/state.rb +0 -122
  87. data/lib/toji/brew/wrapped_state.rb +0 -109
  88. data/lib/toji/event.rb +0 -5
  89. data/lib/toji/event/action_event.rb +0 -12
  90. data/lib/toji/event/kake_event.rb +0 -13
  91. data/lib/toji/event/koji_event.rb +0 -19
  92. data/lib/toji/event/rice_event.rb +0 -34
  93. data/lib/toji/ingredient/kake/actual.rb +0 -26
  94. data/lib/toji/ingredient/kake/base.rb +0 -18
  95. data/lib/toji/ingredient/kake/expected.rb +0 -40
  96. data/lib/toji/ingredient/koji/actual.rb +0 -29
  97. data/lib/toji/ingredient/koji/actual_fermentable.rb +0 -15
  98. data/lib/toji/ingredient/koji/base.rb +0 -35
  99. data/lib/toji/ingredient/koji/expected.rb +0 -45
  100. data/lib/toji/ingredient/koji/expected_fermentable.rb +0 -15
  101. data/lib/toji/ingredient/koji_rate.rb +0 -16
  102. data/lib/toji/ingredient/rice/actual_steamable.rb +0 -27
  103. data/lib/toji/ingredient/rice/base.rb +0 -40
  104. data/lib/toji/ingredient/rice/expected_steamable.rb +0 -27
  105. data/lib/toji/ingredient/rice_rate.rb +0 -23
  106. data/lib/toji/product/event_factory.rb +0 -70
data/example/kake_ingredient.rb CHANGED
@@ -1,26 +1,32 @@
1
+ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
1
2
  require 'toji'
3
+ require_relative 'example_core'
2
4
  require 'terminal-table'
3
5
 
4
- kake = Toji::Ingredient::Kake.expected(100, rice_rate: Toji::Ingredient::RiceRate::DEFAULT)
6
+ kake = Example::Kake.new(
7
+ weight: 100,
8
+ brand: :yamadanishiki,
9
+ polishing_ratio: 0.55,
10
+ made_in: :hyogo,
11
+ year: 2020,
12
+ soaking_ratio: 0.33,
13
+ steaming_ratio: 0.41,
14
+ cooling_ratio: 0.33,
15
+ interval_days: 0,
16
+ )
5
17
 
6
18
  table = Terminal::Table.new do |t|
7
- t << ["", "分量", "白米を基準とした歩合"]
19
+ t << ["工程", "状態", "分量/歩合"]
8
20
  t << :separator
9
- t << ["蒸米", kake.steamed&.round(2), (1.0 + kake.steamed_rate)&.round(2)]
10
- t << [" 白米", kake.raw&.round(2), 1.0]
11
- t << [" 汲水", kake.soaking_water&.round(2), kake.soaked_rate&.round(2)]
12
- end
13
- puts table
14
- puts
15
-
16
- table = Terminal::Table.new do |t|
17
- t << ["工程", "原料", "分量"]
21
+ t << ["", "白米", kake.weight.round(2)]
18
22
  t << :separator
19
- t << ["洗米・浸漬", "白米", kake.raw&.round(2)]
20
- t << ["", "吸水増加量", kake.soaking_water&.round(2)]
23
+ t << ["洗米・浸漬", "浸漬米(g)", kake.soaked.round(2)]
24
+ t << ["", "浸漬米吸水率", kake.soaking_ratio.round(2)]
21
25
  t << :separator
22
- t << ["水切り", "浸漬米", kake.soaked&.round(2)]
26
+ t << ["蒸し", "蒸米(g)", kake.steamed.round(2)]
27
+ t << ["", "蒸米吸水率", kake.steaming_ratio.round(2)]
23
28
  t << :separator
24
- t << ["蒸し", "蒸米", kake.steamed&.round(2)]
29
+ t << ["放冷", "蒸米(g)", kake.cooled.round(2)]
30
+ t << ["", "蒸米吸水率", kake.cooling_ratio.round(2)]
25
31
  end
26
32
  puts table
data/example/koji_ingredient.rb CHANGED
@@ -1,33 +1,43 @@
1
+ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
1
2
  require 'toji'
3
+ require_relative 'example_core'
2
4
  require 'terminal-table'
3
5
 
4
- koji = Toji::Ingredient::Koji.expected(100, rice_rate: Toji::Ingredient::RiceRate::DEFAULT, koji_rate: Toji::Ingredient::KojiRate::DEFAULT)
6
+ koji = Example::Koji.new(
7
+ weight: 100,
8
+ brand: :yamadanishiki,
9
+ polishing_ratio: 0.55,
10
+ made_in: :hyogo,
11
+ year: 2020,
12
+ soaking_ratio: 0.33,
13
+ steaming_ratio: 0.41,
14
+ cooling_ratio: 0.33,
15
+ tanekojis: [
16
+ Example::Tanekoji.new(
17
+ brand: :byakuya,
18
+ ratio: 0.001,
19
+ ),
20
+ ],
21
+ dekoji_ratio: 0.18,
22
+ interval_days: 0,
23
+ )
5
24
 
6
25
  table = Terminal::Table.new do |t|
7
- t << ["", "分量", "白米を基準とした歩合"]
26
+ t << ["工程", "状態", "分量/歩合"]
8
27
  t << :separator
9
- t << ["麹", koji.dekoji&.round(2), (1.0 + koji.dekoji_rate)&.round(2)]
10
- t << [" 蒸米", koji.steamed&.round(2), (1.0 + koji.steamed_rate)&.round(2)]
11
- t << [" 白米", koji.raw&.round(2), 1.0]
12
- t << [" 汲水", koji.soaking_water&.round(2), koji.soaked_rate&.round(2)]
13
- t << [" 種麹", koji.tanekoji&.round(2), koji.tanekoji_rate&.round(2)]
14
- end
15
- puts table
16
- puts
17
-
18
- table = Terminal::Table.new do |t|
19
- t << ["工程", "原料", "分量"]
20
- t << :separator
21
- t << ["洗米・浸漬", "白米", koji.raw&.round(2)]
22
- t << ["", "吸水増加量", koji.soaking_water&.round(2)]
28
+ t << ["", "白米", koji.weight.round(2)]
23
29
  t << :separator
24
- t << ["水切り", "浸漬米", koji.soaked&.round(2)]
30
+ t << ["洗米・浸漬", "浸漬米(g)", koji.soaked.round(2)]
31
+ t << ["", "浸漬米吸水率", koji.soaking_ratio.round(2)]
25
32
  t << :separator
26
- t << ["蒸し", "蒸米", koji.steamed&.round(2)]
33
+ t << ["蒸し", "蒸米(g)", koji.steamed.round(2)]
34
+ t << ["", "蒸米吸水率", koji.steaming_ratio.round(2)]
27
35
  t << :separator
28
- t << ["放冷・引込み", "蒸米", koji.cooled&.round(2)]
29
- t << ["", "種麹", koji.tanekoji&.round(2)]
36
+ t << ["放冷・引込み", "蒸米(g)", koji.cooled.round(2)]
37
+ t << ["", "蒸米吸水率", koji.cooling_ratio.round(2)]
38
+ t << ["", "種麹", koji.tanekojis.map(&:weight).sum.round(2)]
30
39
  t << :separator
31
- t << ["製麹", "麹", koji.dekoji&.round(2)]
40
+ t << ["出麹", "麹(g)", koji.dekoji.round(2)]
41
+ t << ["", "出麹歩合", koji.dekoji_ratio.round(2)]
32
42
  end
33
43
  puts table
data/example/{koji_making.ipynb → koji_progress.ipynb} RENAMED
@@ -14,25 +14,25 @@
14
14
  " </script>\n",
15
15
  "\n",
16
16
  "\n",
17
- "<div id=\"76f5d897-2b07-46a5-b012-952607d8b9fc\" style=\"height: 100%; width: 100%;\"></div>\n",
17
+ "<div id=\"f82ea026-314c-4881-9000-5474bf1c7f69\" style=\"height: 100%; width: 100%;\"></div>\n",
18
18
  "\n",
19
19
  "<script>\n",
20
20
  " require(['plotly'], function(Plotly) { \n",
21
21
  "Plotly.newPlot(\n",
22
- " '76f5d897-2b07-46a5-b012-952607d8b9fc',\n",
23
- " [{\"x\":[0,32400.0,36000.0,64800.0,64801.0,108000.0,108001.0,136800.0,136801.0,158400.0,158401.0,172800.0,190800.0],\"y\":[null,35.0,32.0,32.0,31.0,35.0,33.0,37.0,35.0,38.0,37.0,40.0,40.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 18:00\",\"01/01 18:00\",\"01/02 06:00\",\"01/02 06:00\",\"01/02 14:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],\"name\":\"temps\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0,32400.0,36000.0,64800.0,108000.0,136800.0,158400.0,172800.0,190800.0],\"y\":[null,28.0,28.0,28.0,28.0,28.0,28.0,28.0,28.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 18:00\",\"01/02 06:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],\"name\":\"room_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[0,108000.0,136800.0,158400.0,172800.0,190800.0],\"y\":[null,4,4,5,5,5],\"text\":[null,\"01/02 06:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],\"name\":\"room_psychrometry\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#d62728\"}}],\n",
22
+ " 'f82ea026-314c-4881-9000-5474bf1c7f69',\n",
23
+ " [{\"x\":[0,32400.0,36000.0,68400.0,68401.0,111600.0,111601.0,140400.0,140401.0,162000.0,162001.0,176400.0,194400.0],\"y\":[null,35.0,32.0,32.0,31.0,35.0,33.0,37.0,35.0,38.0,37.0,40.0,40.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 19:00\",\"01/01 19:00\",\"01/02 07:00\",\"01/02 07:00\",\"01/02 15:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],\"name\":\"temps\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0,32400.0,36000.0,68400.0,111600.0,140400.0,162000.0,176400.0,194400.0],\"y\":[null,28.0,28.0,28.0,28.0,28.0,28.0,28.0,28.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 19:00\",\"01/02 07:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],\"name\":\"room_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[0,111600.0,140400.0,162000.0,176400.0,194400.0],\"y\":[null,4,4,5,5,5],\"text\":[null,\"01/02 07:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],\"name\":\"room_psychrometry\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#d62728\"}}],\n",
24
24
  " {\"xaxis\":{\"dtick\":86400,\"tickvals\":[0,86400,172800],\"ticktext\":[\"1\",\"2\",\"3\"]},\"annotations\":[]},\n",
25
25
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
26
26
  ")\n",
27
27
  "\n",
28
28
  "window.addEventListener('resize', function() {\n",
29
- " Plotly.Plots.resize(document.getElementById('76f5d897-2b07-46a5-b012-952607d8b9fc'))\n",
29
+ " Plotly.Plots.resize(document.getElementById('f82ea026-314c-4881-9000-5474bf1c7f69'))\n",
30
30
  "})\n",
31
31
  " }) \n",
32
32
  "</script>"
33
33
  ],
34
34
  "text/plain": [
35
- "#<Plotly::Offline::HTML:0x00007fa2da91a198 @id=\"76f5d897-2b07-46a5-b012-952607d8b9fc\", @data=[{:x=>[0, 32400.0, 36000.0, 64800.0, 64801.0, 108000.0, 108001.0, 136800.0, 136801.0, 158400.0, 158401.0, 172800.0, 190800.0], :y=>[nil, 35.0, 32.0, 32.0, 31.0, 35.0, 33.0, 37.0, 35.0, 38.0, 37.0, 40.0, 40.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 18:00\", \"01/01 18:00\", \"01/02 06:00\", \"01/02 06:00\", \"01/02 14:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], :name=>\"temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0, 32400.0, 36000.0, 64800.0, 108000.0, 136800.0, 158400.0, 172800.0, 190800.0], :y=>[nil, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 18:00\", \"01/02 06:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], :name=>\"room_temp\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[0, 108000.0, 136800.0, 158400.0, 172800.0, 190800.0], :y=>[nil, 4, 4, 5, 5, 5], :text=>[nil, \"01/02 06:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], :name=>\"room_psychrometry\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#d62728\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800], :ticktext=>[\"1\", \"2\", \"3\"]}, :annotations=>[]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
35
+ "#<Plotly::Offline::HTML:0x00007f802d945db8 @id=\"f82ea026-314c-4881-9000-5474bf1c7f69\", @data=[{:x=>[0, 32400.0, 36000.0, 68400.0, 68401.0, 111600.0, 111601.0, 140400.0, 140401.0, 162000.0, 162001.0, 176400.0, 194400.0], :y=>[nil, 35.0, 32.0, 32.0, 31.0, 35.0, 33.0, 37.0, 35.0, 38.0, 37.0, 40.0, 40.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 19:00\", \"01/01 19:00\", \"01/02 07:00\", \"01/02 07:00\", \"01/02 15:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], :name=>\"temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0, 32400.0, 36000.0, 68400.0, 111600.0, 140400.0, 162000.0, 176400.0, 194400.0], :y=>[nil, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 19:00\", \"01/02 07:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], :name=>\"room_temp\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[0, 111600.0, 140400.0, 162000.0, 176400.0, 194400.0], :y=>[nil, 4, 4, 5, 5, 5], :text=>[nil, \"01/02 07:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], :name=>\"room_psychrometry\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#d62728\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800], :ticktext=>[\"1\", \"2\", \"3\"]}, :annotations=>[]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
36
36
  ]
37
37
  },
38
38
  "metadata": {},
@@ -47,25 +47,25 @@
47
47
  " </script>\n",
48
48
  "\n",
49
49
  "\n",
50
- "<div id=\"af573d43-29b8-46b3-8ee4-c37cf07d2b5b\" style=\"height: 100%; width: 100%;\"></div>\n",
50
+ "<div id=\"cd67f8ad-d90f-4dbe-ae08-d5db73d61827\" style=\"height: 100%; width: 100%;\"></div>\n",
51
51
  "\n",
52
52
  "<script>\n",
53
53
  " require(['plotly'], function(Plotly) { \n",
54
54
  "Plotly.newPlot(\n",
55
- " 'af573d43-29b8-46b3-8ee4-c37cf07d2b5b',\n",
56
- " [{\"type\":\"table\",\"header\":{\"values\":[\"day_label\",\"display_time\",\"mark\",\"temps\",\"room_temp\",\"room_psychrometry\"]},\"cells\":{\"values\":[[\"1\",\"1\",\"1\",\"2\",\"2\",\"2\",\"3\",\"3\"],[\"01/01 09:00\",\"01/01 10:00\",\"01/01 18:00\",\"01/02 06:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],[\"引込み\",\"床揉み\",\"切返し\",\"盛り\",\"仲仕事\",\"仕舞仕事\",\"最高積替\",\"出麹\"],[\"35.0\",\"32.0\",\"32.0, 31.0\",\"35.0, 33.0\",\"37.0, 35.0\",\"38.0, 37.0\",\"40.0\",\"40.0\"],[28.0,28.0,28.0,28.0,28.0,28.0,28.0,28.0],[\"\",\"\",\"\",4,4,5,5,5]]}}],\n",
55
+ " 'cd67f8ad-d90f-4dbe-ae08-d5db73d61827',\n",
56
+ " [{\"type\":\"table\",\"header\":{\"values\":[\"day_label\",\"display_time\",\"mark\",\"temps\",\"room_temp\",\"room_psychrometry\"]},\"cells\":{\"values\":[[\"1\",\"1\",\"1\",\"2\",\"2\",\"2\",\"3\",\"3\"],[\"01/01 09:00\",\"01/01 10:00\",\"01/01 19:00\",\"01/02 07:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],[\"引込み\",\"床揉み\",\"切返し\",\"盛り\",\"仲仕事\",\"仕舞仕事\",\"最高積替\",\"出麹\"],[\"35.0\",\"32.0\",\"32.0, 31.0\",\"35.0, 33.0\",\"37.0, 35.0\",\"38.0, 37.0\",\"40.0\",\"40.0\"],[\"28.0\",\"28.0\",\"28.0\",\"28.0\",\"28.0\",\"28.0\",\"28.0\",\"28.0\"],[\"\",\"\",\"\",\"4\",\"4\",\"5\",\"5\",\"5\"]]}}],\n",
57
57
  " {},\n",
58
58
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
59
59
  ")\n",
60
60
  "\n",
61
61
  "window.addEventListener('resize', function() {\n",
62
- " Plotly.Plots.resize(document.getElementById('af573d43-29b8-46b3-8ee4-c37cf07d2b5b'))\n",
62
+ " Plotly.Plots.resize(document.getElementById('cd67f8ad-d90f-4dbe-ae08-d5db73d61827'))\n",
63
63
  "})\n",
64
64
  " }) \n",
65
65
  "</script>"
66
66
  ],
67
67
  "text/plain": [
68
- "#<Plotly::Offline::HTML:0x00007fa2da297c08 @id=\"af573d43-29b8-46b3-8ee4-c37cf07d2b5b\", @data=[{:type=>:table, :header=>{:values=>[:day_label, :display_time, :mark, :temps, :room_temp, :room_psychrometry]}, :cells=>{:values=>[[\"1\", \"1\", \"1\", \"2\", \"2\", \"2\", \"3\", \"3\"], [\"01/01 09:00\", \"01/01 10:00\", \"01/01 18:00\", \"01/02 06:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], [\"引込み\", \"床揉み\", \"切返し\", \"盛り\", \"仲仕事\", \"仕舞仕事\", \"最高積替\", \"出麹\"], [\"35.0\", \"32.0\", \"32.0, 31.0\", \"35.0, 33.0\", \"37.0, 35.0\", \"38.0, 37.0\", \"40.0\", \"40.0\"], [28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0], [\"\", \"\", \"\", 4, 4, 5, 5, 5]]}}], @layout={}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
68
+ "#<Plotly::Offline::HTML:0x00007f802d99e120 @id=\"cd67f8ad-d90f-4dbe-ae08-d5db73d61827\", @data=[{:type=>:table, :header=>{:values=>[:day_label, :display_time, :mark, :temps, :room_temp, :room_psychrometry]}, :cells=>{:values=>[[\"1\", \"1\", \"1\", \"2\", \"2\", \"2\", \"3\", \"3\"], [\"01/01 09:00\", \"01/01 10:00\", \"01/01 19:00\", \"01/02 07:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], [\"引込み\", \"床揉み\", \"切返し\", \"盛り\", \"仲仕事\", \"仕舞仕事\", \"最高積替\", \"出麹\"], [\"35.0\", \"32.0\", \"32.0, 31.0\", \"35.0, 33.0\", \"37.0, 35.0\", \"38.0, 37.0\", \"40.0\", \"40.0\"], [\"28.0\", \"28.0\", \"28.0\", \"28.0\", \"28.0\", \"28.0\", \"28.0\", \"28.0\"], [\"\", \"\", \"\", \"4\", \"4\", \"5\", \"5\", \"5\"]]}}], @layout={}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
69
69
  ]
70
70
  },
71
71
  "metadata": {},
@@ -74,7 +74,7 @@
74
74
  {
75
75
  "data": {
76
76
  "text/plain": [
77
- "#<CZTop::Socket::PUB:0x7fa2dea5d820 last_endpoint=\"tcp://127.0.0.1:53216\">"
77
+ "#<CZTop::Socket::PUB:0x7f802f17f0a0 last_endpoint=\"tcp://127.0.0.1:60433\">"
78
78
  ]
79
79
  },
80
80
  "execution_count": 1,
@@ -88,9 +88,9 @@
88
88
  "require './example_core'\n",
89
89
  "require 'rbplotly'\n",
90
90
  "\n",
91
- "koji = Example::Brew::Koji.load_yaml_file(\"koji_making.yaml\")\n",
92
- "koji.progress(enable_annotations: false).plot.show\n",
93
- "koji.progress.table.show"
91
+ "koji = Example::Progress::KojiProgress.load_yaml_file(\"koji_progress.yaml\")\n",
92
+ "koji.progress_note(enable_annotations: false).plot.show\n",
93
+ "koji.progress_note.table.show"
94
94
  ]
95
95
  },
96
96
  {
data/example/{koji_making.rb → koji_progress.rb} RENAMED
@@ -1,13 +1,14 @@
1
+ $LOAD_PATH << File.dirname(__FILE__) + "/../lib"
1
2
  require 'toji'
2
3
  require_relative 'example_core'
3
4
  require 'terminal-table'
4
5
 
5
- koji = Example::Brew::Koji.load_yaml_file(File.dirname(__FILE__)+"/koji_making.yaml")
6
+ koji = Example::Progress::KojiProgress.load_yaml_file(File.dirname(__FILE__)+"/koji_progress.yaml")
6
7
 
7
8
  table = Terminal::Table.new do |t|
8
9
  t << ["作業", "日数", "品温(度)", "操作室温", "乾湿差(度)", "経過時間", "日時"]
9
10
  t << :separator
10
- koji.wrapped_states.each {|s|
11
+ koji.states.each {|s|
11
12
  temp = s.temps.map(&:to_s).join(" / ")
12
13
  t << [s.mark, s.day_label, temp, s.room_temp, s.room_psychrometry, s.elapsed_time, s.display_time]
13
14
  }
data/example/{koji_making.yaml → koji_progress.yaml} RENAMED
@@ -1,50 +1,49 @@
1
1
  date_line: 0
2
2
  states:
3
- - time: 2020-1-1 9:00
4
- elapsed_time: 0
3
+ - time: 2020-01-01 09:00
5
4
  mark: 引込み
6
5
  temps: 35.0
7
6
  room_temp: 28.0
8
7
  room_psychrometry:
9
- - elapsed_time: 3600
8
+ - time: 2020-01-01 10:00
10
9
  mark: 床揉み
11
10
  temps: 32.0
12
11
  room_temp: 28.0
13
12
  room_psychrometry:
14
- - elapsed_time: 32400
13
+ - time: 2020-01-01 19:00
15
14
  mark: 切返し
16
15
  temps:
17
16
  - 32.0
18
17
  - 31.0
19
18
  room_temp: 28.0
20
19
  room_psychrometry:
21
- - elapsed_time: 75600
20
+ - time: 2020-01-02 7:00
22
21
  mark: 盛り
23
22
  temps:
24
23
  - 35.0
25
24
  - 33.0
26
25
  room_temp: 28.0
27
26
  room_psychrometry: 4
28
- - elapsed_time: 104400
27
+ - time: 2020-01-02 15:00
29
28
  mark: 仲仕事
30
29
  temps:
31
30
  - 37.0
32
31
  - 35.0
33
32
  room_temp: 28.0
34
33
  room_psychrometry: 4
35
- - elapsed_time: 126000
34
+ - time: 2020-01-02 21:00
36
35
  mark: 仕舞仕事
37
36
  temps:
38
37
  - 38.0
39
38
  - 37.0
40
39
  room_temp: 28.0
41
40
  room_psychrometry: 5
42
- - elapsed_time: 140400
41
+ - time: 2020-01-03 1:00
43
42
  mark: 最高積替
44
43
  temps: 40.0
45
44
  room_temp: 28.0
46
45
  room_psychrometry: 5
47
- - elapsed_time: 158400
46
+ - time: 2020-01-03 6:00
48
47
  mark: 出麹
49
48
  temps: 40.0
50
49
  room_temp: 28.0
data/example/{koji_making_multi.ipynb → koji_progress_multi.ipynb} RENAMED
@@ -2,7 +2,7 @@
2
2
  "cells": [
3
3
  {
4
4
  "cell_type": "code",
5
- "execution_count": 4,
5
+ "execution_count": 1,
6
6
  "metadata": {
7
7
  "scrolled": false
8
8
  },
@@ -16,25 +16,25 @@
16
16
  " </script>\n",
17
17
  "\n",
18
18
  "\n",
19
- "<div id=\"5e86d313-d679-4b38-86a5-cb629e1b5c23\" style=\"height: 100%; width: 100%;\"></div>\n",
19
+ "<div id=\"d3cbeb2a-3500-4ef7-a156-99f4e83a1120\" style=\"height: 100%; width: 100%;\"></div>\n",
20
20
  "\n",
21
21
  "<script>\n",
22
22
  " require(['plotly'], function(Plotly) { \n",
23
23
  "Plotly.newPlot(\n",
24
- " '5e86d313-d679-4b38-86a5-cb629e1b5c23',\n",
25
- " [{\"x\":[0,55794.0,62994.0,88194.0,88195.0,120594.0,141294.0,141295.0,173694.0,173695.0,179994.0,212394.0,212395.0,224994.0,239394.0],\"y\":[null,27.3,27.2,31.2,30.1,30.7,32.7,31.2,35.6,33.5,34.8,36.2,34.7,38.9,41.6],\"text\":[null,\"03/28 15:30\",\"03/28 17:30\",\"03/29 00:30\",\"03/29 00:30\",\"03/29 09:30\",\"03/29 15:15\",\"03/29 15:15\",\"03/30 00:15\",\"03/30 00:15\",\"03/30 02:00\",\"03/30 11:00\",\"03/30 11:00\",\"03/30 14:30\",\"03/30 18:30\"],\"name\":\"actual temps\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0,55794.0,62994.0,88194.0,120594.0,141294.0,173694.0,179994.0,212394.0,224994.0,239394.0],\"y\":[null,30,33,33,35,35,37,40,45,50,50],\"text\":[null,\"03/28 15:30\",\"03/28 17:30\",\"03/29 00:30\",\"03/29 09:30\",\"03/29 15:15\",\"03/30 00:15\",\"03/30 02:00\",\"03/30 11:00\",\"03/30 14:30\",\"03/30 18:30\"],\"name\":\"actual preset_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"hv\"},\"marker\":{\"color\":\"#ff7f0e\"}},{\"x\":[0,55794.0,88194.0,120594.0,141294.0,173694.0,212394.0,224994.0,239394.0],\"y\":[null,29,28.5,27,28,28,30,31,36],\"text\":[null,\"03/28 15:30\",\"03/29 00:30\",\"03/29 09:30\",\"03/29 15:15\",\"03/30 00:15\",\"03/30 11:00\",\"03/30 14:30\",\"03/30 18:30\"],\"name\":\"actual room_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[0,32400.0,36000.0,64800.0,64801.0,108000.0,108001.0,136800.0,136801.0,158400.0,158401.0,172800.0,190800.0],\"y\":[null,35.0,32.0,32.0,31.0,35.0,33.0,37.0,35.0,38.0,37.0,40.0,40.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 18:00\",\"01/01 18:00\",\"01/02 06:00\",\"01/02 06:00\",\"01/02 14:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],\"name\":\"expect temps\",\"line\":{\"dash\":\"dot\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0,32400.0,36000.0,64800.0,108000.0,136800.0,158400.0,172800.0,190800.0],\"y\":[null,28.0,28.0,28.0,28.0,28.0,28.0,28.0,28.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 18:00\",\"01/02 06:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],\"name\":\"expect room_temp\",\"line\":{\"dash\":\"dot\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[0,108000.0,136800.0,158400.0,172800.0,190800.0],\"y\":[null,4,4,5,5,5],\"text\":[null,\"01/02 06:00\",\"01/02 14:00\",\"01/02 20:00\",\"01/03 00:00\",\"01/03 05:00\"],\"name\":\"expect room_psychrometry\",\"line\":{\"dash\":\"dot\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#d62728\"}}],\n",
24
+ " 'd3cbeb2a-3500-4ef7-a156-99f4e83a1120',\n",
25
+ " [{\"x\":[0,55794.0,62994.0,88194.0,88195.0,120594.0,141294.0,141295.0,173694.0,173695.0,179994.0,212394.0,212395.0,224994.0,239394.0],\"y\":[null,27.3,27.2,31.2,30.1,30.7,32.7,31.2,35.6,33.5,34.8,36.2,34.7,38.9,41.6],\"text\":[null,\"03/28 15:30\",\"03/28 17:30\",\"03/29 00:30\",\"03/29 00:30\",\"03/29 09:30\",\"03/29 15:15\",\"03/29 15:15\",\"03/30 00:15\",\"03/30 00:15\",\"03/30 02:00\",\"03/30 11:00\",\"03/30 11:00\",\"03/30 14:30\",\"03/30 18:30\"],\"name\":\"actual temps\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0,55794.0,62994.0,88194.0,120594.0,141294.0,173694.0,179994.0,212394.0,224994.0,239394.0],\"y\":[null,30,33,33,35,35,37,40,45,50,50],\"text\":[null,\"03/28 15:30\",\"03/28 17:30\",\"03/29 00:30\",\"03/29 09:30\",\"03/29 15:15\",\"03/30 00:15\",\"03/30 02:00\",\"03/30 11:00\",\"03/30 14:30\",\"03/30 18:30\"],\"name\":\"actual preset_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"hv\"},\"marker\":{\"color\":\"#ff7f0e\"}},{\"x\":[0,55794.0,88194.0,120594.0,141294.0,173694.0,212394.0,224994.0,239394.0],\"y\":[null,29,28.5,27,28,28,30,31,36],\"text\":[null,\"03/28 15:30\",\"03/29 00:30\",\"03/29 09:30\",\"03/29 15:15\",\"03/30 00:15\",\"03/30 11:00\",\"03/30 14:30\",\"03/30 18:30\"],\"name\":\"actual room_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[0,32400.0,36000.0,68400.0,68401.0,111600.0,111601.0,140400.0,140401.0,162000.0,162001.0,176400.0,194400.0],\"y\":[null,35.0,32.0,32.0,31.0,35.0,33.0,37.0,35.0,38.0,37.0,40.0,40.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 19:00\",\"01/01 19:00\",\"01/02 07:00\",\"01/02 07:00\",\"01/02 15:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],\"name\":\"expect temps\",\"line\":{\"dash\":\"dot\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0,32400.0,36000.0,68400.0,111600.0,140400.0,162000.0,176400.0,194400.0],\"y\":[null,28.0,28.0,28.0,28.0,28.0,28.0,28.0,28.0],\"text\":[null,\"01/01 09:00\",\"01/01 10:00\",\"01/01 19:00\",\"01/02 07:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],\"name\":\"expect room_temp\",\"line\":{\"dash\":\"dot\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[0,111600.0,140400.0,162000.0,176400.0,194400.0],\"y\":[null,4,4,5,5,5],\"text\":[null,\"01/02 07:00\",\"01/02 15:00\",\"01/02 21:00\",\"01/03 01:00\",\"01/03 06:00\"],\"name\":\"expect room_psychrometry\",\"line\":{\"dash\":\"dot\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#d62728\"}}],\n",
26
26
  " {\"xaxis\":{\"dtick\":86400,\"tickvals\":[0,86400,172800],\"ticktext\":[\"1\",\"2\",\"3\"]},\"annotations\":[{\"x\":55794.0,\"y\":27.3,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"引込み\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":88194.0,\"y\":31.2,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"切返し\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":141294.0,\"y\":32.7,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"盛り\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":173694.0,\"y\":35.6,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"仲仕事\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":212394.0,\"y\":36.2,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"仕舞仕事\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":239394.0,\"y\":41.6,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"出麹\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40}]},\n",
27
27
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
28
28
  ")\n",
29
29
  "\n",
30
30
  "window.addEventListener('resize', function() {\n",
31
- " Plotly.Plots.resize(document.getElementById('5e86d313-d679-4b38-86a5-cb629e1b5c23'))\n",
31
+ " Plotly.Plots.resize(document.getElementById('d3cbeb2a-3500-4ef7-a156-99f4e83a1120'))\n",
32
32
  "})\n",
33
33
  " }) \n",
34
34
  "</script>"
35
35
  ],
36
36
  "text/plain": [
37
- "#<Plotly::Offline::HTML:0x00007f84481882f0 @id=\"5e86d313-d679-4b38-86a5-cb629e1b5c23\", @data=[{:x=>[0, 55794.0, 62994.0, 88194.0, 88195.0, 120594.0, 141294.0, 141295.0, 173694.0, 173695.0, 179994.0, 212394.0, 212395.0, 224994.0, 239394.0], :y=>[nil, 27.3, 27.2, 31.2, 30.1, 30.7, 32.7, 31.2, 35.6, 33.5, 34.8, 36.2, 34.7, 38.9, 41.6], :text=>[nil, \"03/28 15:30\", \"03/28 17:30\", \"03/29 00:30\", \"03/29 00:30\", \"03/29 09:30\", \"03/29 15:15\", \"03/29 15:15\", \"03/30 00:15\", \"03/30 00:15\", \"03/30 02:00\", \"03/30 11:00\", \"03/30 11:00\", \"03/30 14:30\", \"03/30 18:30\"], :name=>\"actual temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0, 55794.0, 62994.0, 88194.0, 120594.0, 141294.0, 173694.0, 179994.0, 212394.0, 224994.0, 239394.0], :y=>[nil, 30, 33, 33, 35, 35, 37, 40, 45, 50, 50], :text=>[nil, \"03/28 15:30\", \"03/28 17:30\", \"03/29 00:30\", \"03/29 09:30\", \"03/29 15:15\", \"03/30 00:15\", \"03/30 02:00\", \"03/30 11:00\", \"03/30 14:30\", \"03/30 18:30\"], :name=>\"actual preset_temp\", :line=>{:dash=>:solid, :shape=>:hv}, :marker=>{:color=>\"#ff7f0e\"}}, {:x=>[0, 55794.0, 88194.0, 120594.0, 141294.0, 173694.0, 212394.0, 224994.0, 239394.0], :y=>[nil, 29, 28.5, 27, 28, 28, 30, 31, 36], :text=>[nil, \"03/28 15:30\", \"03/29 00:30\", \"03/29 09:30\", \"03/29 15:15\", \"03/30 00:15\", \"03/30 11:00\", \"03/30 14:30\", \"03/30 18:30\"], :name=>\"actual room_temp\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[0, 32400.0, 36000.0, 64800.0, 64801.0, 108000.0, 108001.0, 136800.0, 136801.0, 158400.0, 158401.0, 172800.0, 190800.0], :y=>[nil, 35.0, 32.0, 32.0, 31.0, 35.0, 33.0, 37.0, 35.0, 38.0, 37.0, 40.0, 40.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 18:00\", \"01/01 18:00\", \"01/02 06:00\", \"01/02 06:00\", \"01/02 14:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], :name=>\"expect temps\", :line=>{:dash=>:dot, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0, 32400.0, 36000.0, 64800.0, 108000.0, 136800.0, 158400.0, 172800.0, 190800.0], :y=>[nil, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 18:00\", \"01/02 06:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], :name=>\"expect room_temp\", :line=>{:dash=>:dot, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[0, 108000.0, 136800.0, 158400.0, 172800.0, 190800.0], :y=>[nil, 4, 4, 5, 5, 5], :text=>[nil, \"01/02 06:00\", \"01/02 14:00\", \"01/02 20:00\", \"01/03 00:00\", \"01/03 05:00\"], :name=>\"expect room_psychrometry\", :line=>{:dash=>:dot, :shape=>:linear}, :marker=>{:color=>\"#d62728\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800], :ticktext=>[\"1\", \"2\", \"3\"]}, :annotations=>[{:x=>55794.0, :y=>27.3, :xref=>\"x\", :yref=>\"y\", :text=>\"引込み\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>88194.0, :y=>31.2, :xref=>\"x\", :yref=>\"y\", :text=>\"切返し\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>141294.0, :y=>32.7, :xref=>\"x\", :yref=>\"y\", :text=>\"盛り\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>173694.0, :y=>35.6, :xref=>\"x\", :yref=>\"y\", :text=>\"仲仕事\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>212394.0, :y=>36.2, :xref=>\"x\", :yref=>\"y\", :text=>\"仕舞仕事\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>239394.0, :y=>41.6, :xref=>\"x\", :yref=>\"y\", :text=>\"出麹\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
37
+ "#<Plotly::Offline::HTML:0x00007fbe30a1adb0 @id=\"d3cbeb2a-3500-4ef7-a156-99f4e83a1120\", @data=[{:x=>[0, 55794.0, 62994.0, 88194.0, 88195.0, 120594.0, 141294.0, 141295.0, 173694.0, 173695.0, 179994.0, 212394.0, 212395.0, 224994.0, 239394.0], :y=>[nil, 27.3, 27.2, 31.2, 30.1, 30.7, 32.7, 31.2, 35.6, 33.5, 34.8, 36.2, 34.7, 38.9, 41.6], :text=>[nil, \"03/28 15:30\", \"03/28 17:30\", \"03/29 00:30\", \"03/29 00:30\", \"03/29 09:30\", \"03/29 15:15\", \"03/29 15:15\", \"03/30 00:15\", \"03/30 00:15\", \"03/30 02:00\", \"03/30 11:00\", \"03/30 11:00\", \"03/30 14:30\", \"03/30 18:30\"], :name=>\"actual temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0, 55794.0, 62994.0, 88194.0, 120594.0, 141294.0, 173694.0, 179994.0, 212394.0, 224994.0, 239394.0], :y=>[nil, 30, 33, 33, 35, 35, 37, 40, 45, 50, 50], :text=>[nil, \"03/28 15:30\", \"03/28 17:30\", \"03/29 00:30\", \"03/29 09:30\", \"03/29 15:15\", \"03/30 00:15\", \"03/30 02:00\", \"03/30 11:00\", \"03/30 14:30\", \"03/30 18:30\"], :name=>\"actual preset_temp\", :line=>{:dash=>:solid, :shape=>:hv}, :marker=>{:color=>\"#ff7f0e\"}}, {:x=>[0, 55794.0, 88194.0, 120594.0, 141294.0, 173694.0, 212394.0, 224994.0, 239394.0], :y=>[nil, 29, 28.5, 27, 28, 28, 30, 31, 36], :text=>[nil, \"03/28 15:30\", \"03/29 00:30\", \"03/29 09:30\", \"03/29 15:15\", \"03/30 00:15\", \"03/30 11:00\", \"03/30 14:30\", \"03/30 18:30\"], :name=>\"actual room_temp\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[0, 32400.0, 36000.0, 68400.0, 68401.0, 111600.0, 111601.0, 140400.0, 140401.0, 162000.0, 162001.0, 176400.0, 194400.0], :y=>[nil, 35.0, 32.0, 32.0, 31.0, 35.0, 33.0, 37.0, 35.0, 38.0, 37.0, 40.0, 40.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 19:00\", \"01/01 19:00\", \"01/02 07:00\", \"01/02 07:00\", \"01/02 15:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], :name=>\"expect temps\", :line=>{:dash=>:dot, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0, 32400.0, 36000.0, 68400.0, 111600.0, 140400.0, 162000.0, 176400.0, 194400.0], :y=>[nil, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0, 28.0], :text=>[nil, \"01/01 09:00\", \"01/01 10:00\", \"01/01 19:00\", \"01/02 07:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], :name=>\"expect room_temp\", :line=>{:dash=>:dot, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[0, 111600.0, 140400.0, 162000.0, 176400.0, 194400.0], :y=>[nil, 4, 4, 5, 5, 5], :text=>[nil, \"01/02 07:00\", \"01/02 15:00\", \"01/02 21:00\", \"01/03 01:00\", \"01/03 06:00\"], :name=>\"expect room_psychrometry\", :line=>{:dash=>:dot, :shape=>:linear}, :marker=>{:color=>\"#d62728\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800], :ticktext=>[\"1\", \"2\", \"3\"]}, :annotations=>[{:x=>55794.0, :y=>27.3, :xref=>\"x\", :yref=>\"y\", :text=>\"引込み\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>88194.0, :y=>31.2, :xref=>\"x\", :yref=>\"y\", :text=>\"切返し\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>141294.0, :y=>32.7, :xref=>\"x\", :yref=>\"y\", :text=>\"盛り\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>173694.0, :y=>35.6, :xref=>\"x\", :yref=>\"y\", :text=>\"仲仕事\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>212394.0, :y=>36.2, :xref=>\"x\", :yref=>\"y\", :text=>\"仕舞仕事\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>239394.0, :y=>41.6, :xref=>\"x\", :yref=>\"y\", :text=>\"出麹\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
38
38
  ]
39
39
  },
40
40
  "metadata": {},
@@ -43,10 +43,10 @@
43
43
  {
44
44
  "data": {
45
45
  "text/plain": [
46
- "#<CZTop::Socket::PUB:0x7f844c20a000 last_endpoint=\"tcp://127.0.0.1:61372\">"
46
+ "#<CZTop::Socket::PUB:0x7fbe37596b80 last_endpoint=\"tcp://127.0.0.1:60026\">"
47
47
  ]
48
48
  },
49
- "execution_count": 4,
49
+ "execution_count": 1,
50
50
  "metadata": {},
51
51
  "output_type": "execute_result"
52
52
  }
@@ -57,24 +57,23 @@
57
57
  "require './example_core'\n",
58
58
  "require 'rbplotly'\n",
59
59
  "\n",
60
- "expect_koji = Example::Brew::Koji.load_yaml_file(\"koji_making.yaml\")\n",
60
+ "expect_koji = Example::Progress::KojiProgress.load_yaml_file(\"koji_progress.yaml\")\n",
61
61
  "\n",
62
- "actual_koji = Example::Brew::Koji.builder\n",
62
+ "actual_koji = Example::Progress::KojiProgress.builder\n",
63
63
  " .date_line(6.5)\n",
64
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 28, 15, 30), mark: \"引込み\", temps: 27.3, preset_temp: 30, room_temp: 29}))\n",
65
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 28, 17, 30), temps: 27.2, preset_temp: 33}))\n",
66
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 29, 0, 30), mark: \"切返し\", temps: [31.2, 30.1], preset_temp: 33, room_temp: 28.5}))\n",
67
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 29, 9, 30), temps: 30.7, preset_temp: 35, room_temp: 27}))\n",
68
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 29, 15, 15), mark: \"盛り\", temps: [32.7, 31.2], preset_temp: 35, room_temp: 28}))\n",
69
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 30, 0, 15), mark: \"仲仕事\", temps: [35.6, 33.5], preset_temp: 37, room_temp: 28}))\n",
70
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 30, 2, 0), temps: 34.8, preset_temp: 40}))\n",
71
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 30, 11, 0), mark: \"仕舞仕事\", temps: [36.2, 34.7], preset_temp: 45, room_temp: 30}))\n",
72
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 30, 14, 30), temps: 38.9, preset_temp: 50, room_temp: 31}))\n",
73
- " .add(Example::Brew::State.create({time: Time.mktime(2020, 3, 30, 18, 30), mark: \"出麹\", temps: 41.6, preset_temp: 50, room_temp: 36}))\n",
74
- " .elapsed_time_interpolation\n",
64
+ " .add({time: Time.mktime(2020, 3, 28, 15, 30), mark: \"引込み\", temps: 27.3, preset_temp: 30, room_temp: 29})\n",
65
+ " .add({time: Time.mktime(2020, 3, 28, 17, 30), temps: 27.2, preset_temp: 33})\n",
66
+ " .add({time: Time.mktime(2020, 3, 29, 0, 30), mark: \"切返し\", temps: [31.2, 30.1], preset_temp: 33, room_temp: 28.5})\n",
67
+ " .add({time: Time.mktime(2020, 3, 29, 9, 30), temps: 30.7, preset_temp: 35, room_temp: 27})\n",
68
+ " .add({time: Time.mktime(2020, 3, 29, 15, 15), mark: \"盛り\", temps: [32.7, 31.2], preset_temp: 35, room_temp: 28})\n",
69
+ " .add({time: Time.mktime(2020, 3, 30, 0, 15), mark: \"仲仕事\", temps: [35.6, 33.5], preset_temp: 37, room_temp: 28})\n",
70
+ " .add({time: Time.mktime(2020, 3, 30, 2, 0), temps: 34.8, preset_temp: 40})\n",
71
+ " .add({time: Time.mktime(2020, 3, 30, 11, 0), mark: \"仕舞仕事\", temps: [36.2, 34.7], preset_temp: 45, room_temp: 30})\n",
72
+ " .add({time: Time.mktime(2020, 3, 30, 14, 30), temps: 38.9, preset_temp: 50, room_temp: 31})\n",
73
+ " .add({time: Time.mktime(2020, 3, 30, 18, 30), mark: \"出麹\", temps: 41.6, preset_temp: 50, room_temp: 36})\n",
75
74
  " .build\n",
76
75
  "\n",
77
- "progress = Toji::Brew::Graph::MultiProgress.new\n",
76
+ "progress = Toji::Progress::Graph::MultiProgressNote.new\n",
78
77
  " .add(actual_koji, :actual, enable_annotations: true)\n",
79
78
  " .add(expect_koji, :expect, enable_annotations: false)\n",
80
79
  "\n",
data/example/{moromi.ipynb → moromi_progress.ipynb} RENAMED
@@ -2,7 +2,7 @@
2
2
  "cells": [
3
3
  {
4
4
  "cell_type": "code",
5
- "execution_count": 4,
5
+ "execution_count": 1,
6
6
  "metadata": {
7
7
  "scrolled": false
8
8
  },
@@ -16,25 +16,25 @@
16
16
  " </script>\n",
17
17
  "\n",
18
18
  "\n",
19
- "<div id=\"0e89b2f2-9a2a-4713-ba37-1f73b14ca4dd\" style=\"height: 100%; width: 100%;\"></div>\n",
19
+ "<div id=\"272793dc-9372-41f1-8825-1cd144668cf7\" style=\"height: 100%; width: 100%;\"></div>\n",
20
20
  "\n",
21
21
  "<script>\n",
22
22
  " require(['plotly'], function(Plotly) { \n",
23
23
  "Plotly.newPlot(\n",
24
- " '0e89b2f2-9a2a-4713-ba37-1f73b14ca4dd',\n",
24
+ " '272793dc-9372-41f1-8825-1cd144668cf7',\n",
25
25
  " [{\"x\":[0.0,1.0,86400.0,172800.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,1209600.0,1296000.0,1382400.0,1468800.0,1555200.0,1641600.0,1728000.0,1814400.0,1900800.0,1987200.0,2073600.0],\"y\":[14.8,11.0,14.3,11.3,6.9,10.6,7.5,8.0,9.1,10.4,11.9,12.3,13.1,13.1,12.9,12.8,12.9,12.6,12.0,11.2,10.2,9.7,9.8,9.1,8.4,8.1,8.3,8.1],\"text\":[\"01/16 00:00\",\"01/16 00:00\",\"01/17 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\",\"01/30 00:00\",\"01/31 00:00\",\"02/01 00:00\",\"02/02 00:00\",\"02/03 00:00\",\"02/04 00:00\",\"02/05 00:00\",\"02/06 00:00\",\"02/07 00:00\",\"02/08 00:00\",\"02/09 00:00\"],\"name\":\"temps\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#1f77b4\"}},{\"x\":[0.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,1209600.0,1296000.0,1382400.0,1468800.0,1555200.0,1641600.0,1728000.0,1814400.0,1900800.0,1987200.0,2073600.0],\"y\":[9,9,8.5,9,6,7,7,8,8,7.5,7.5,7.5,7.0,8.0,8.0,7.0,7.0,6.5,7.0,8.0,6.0,5.0,5.0,7.0,6.0],\"text\":[\"01/16 00: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\",\"01/30 00:00\",\"01/31 00:00\",\"02/01 00:00\",\"02/02 00:00\",\"02/03 00:00\",\"02/04 00:00\",\"02/05 00:00\",\"02/06 00:00\",\"02/07 00:00\",\"02/08 00:00\",\"02/09 00:00\"],\"name\":\"room_temp\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#2ca02c\"}},{\"x\":[604800.0,691200.0,777600.0,864000.0,950400.0,1036800.0,1123200.0,1209600.0,1296000.0,1382400.0,1468800.0,1641600.0,1728000.0,1814400.0,1900800.0,1987200.0],\"y\":[8.6,8.0,7.2,5.8,4.8,4.0,3.4,2.7,2.1,1.7,1.3,0.8,0.5,0.3,0.2,-0.0],\"text\":[\"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\",\"01/30 00:00\",\"01/31 00:00\",\"02/01 00:00\",\"02/02 00:00\",\"02/04 00:00\",\"02/05 00:00\",\"02/06 00:00\",\"02/07 00:00\",\"02/08 00:00\"],\"name\":\"baume\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#9467bd\"}},{\"x\":[691200.0,777600.0,864000.0,1036800.0,1123200.0,1209600.0,1296000.0,1641600.0,1814400.0],\"y\":[4.8,6.75,7.992,10.7,11.6,12.7,13.7,16.0,16.3],\"text\":[\"01/24 00:00\",\"01/25 00:00\",\"01/26 00:00\",\"01/28 00:00\",\"01/29 00:00\",\"01/30 00:00\",\"01/31 00:00\",\"02/04 00:00\",\"02/06 00:00\"],\"name\":\"alcohol\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#7f7f7f\"}},{\"x\":[604800.0,691200.0,777600.0,864000.0,950400.0,1036800.0,1123200.0,1209600.0,1296000.0,1382400.0,1468800.0,1641600.0,1728000.0,1814400.0,1900800.0,1987200.0],\"y\":[34.4,40.0,43.2,40.6,38.4,36.0,34.0,29.700000000000003,25.200000000000003,22.099999999999998,18.2,12.8,8.5,5.3999999999999995,3.8000000000000003,-0.0],\"text\":[\"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\",\"01/30 00:00\",\"01/31 00:00\",\"02/01 00:00\",\"02/02 00:00\",\"02/04 00:00\",\"02/05 00:00\",\"02/06 00:00\",\"02/07 00:00\",\"02/08 00:00\"],\"name\":\"bmd\",\"line\":{\"dash\":\"solid\",\"shape\":\"linear\"},\"marker\":{\"color\":\"#bcbd22\"}}],\n",
26
26
  " {\"xaxis\":{\"dtick\":86400,\"tickvals\":[0,86400,172800,259200,345600,432000,518400,604800,691200,777600,864000,950400,1036800,1123200,1209600,1296000,1382400,1468800,1555200,1641600,1728000,1814400,1900800,1987200,2073600],\"ticktext\":[\"添\",\"踊\",\"踊\",\"仲\",\"留\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"10\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\",\"17\",\"18\",\"19\",\"20\",\"21\",\"22\"]},\"annotations\":[{\"x\":0.0,\"y\":14.8,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"添\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":259200.0,\"y\":6.9,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"仲\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40},{\"x\":345600.0,\"y\":7.5,\"xref\":\"x\",\"yref\":\"y\",\"text\":\"留\",\"showarrow\":true,\"arrowhead\":1,\"ax\":0,\"ay\":-40}]},\n",
27
27
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
28
28
  ")\n",
29
29
  "\n",
30
30
  "window.addEventListener('resize', function() {\n",
31
- " Plotly.Plots.resize(document.getElementById('0e89b2f2-9a2a-4713-ba37-1f73b14ca4dd'))\n",
31
+ " Plotly.Plots.resize(document.getElementById('272793dc-9372-41f1-8825-1cd144668cf7'))\n",
32
32
  "})\n",
33
33
  " }) \n",
34
34
  "</script>"
35
35
  ],
36
36
  "text/plain": [
37
- "#<Plotly::Offline::HTML:0x00007fe57118c758 @id=\"0e89b2f2-9a2a-4713-ba37-1f73b14ca4dd\", @data=[{:x=>[0.0, 1.0, 86400.0, 172800.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, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1555200.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0, 2073600.0], :y=>[14.8, 11.0, 14.3, 11.3, 6.9, 10.6, 7.5, 8.0, 9.1, 10.4, 11.9, 12.3, 13.1, 13.1, 12.9, 12.8, 12.9, 12.6, 12.0, 11.2, 10.2, 9.7, 9.8, 9.1, 8.4, 8.1, 8.3, 8.1], :text=>[\"01/16 00:00\", \"01/16 00:00\", \"01/17 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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/03 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\", \"02/09 00:00\"], :name=>\"temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0.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, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1555200.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0, 2073600.0], :y=>[9, 9, 8.5, 9, 6, 7, 7, 8, 8, 7.5, 7.5, 7.5, 7.0, 8.0, 8.0, 7.0, 7.0, 6.5, 7.0, 8.0, 6.0, 5.0, 5.0, 7.0, 6.0], :text=>[\"01/16 00: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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/03 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\", \"02/09 00:00\"], :name=>\"room_temp\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0], :y=>[8.6, 8.0, 7.2, 5.8, 4.8, 4.0, 3.4, 2.7, 2.1, 1.7, 1.3, 0.8, 0.5, 0.3, 0.2, -0.0], :text=>[\"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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\"], :name=>\"baume\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#9467bd\"}}, {:x=>[691200.0, 777600.0, 864000.0, 1036800.0, 1123200.0, 1209600.0, 1296000.0, 1641600.0, 1814400.0], :y=>[4.8, 6.75, 7.992, 10.7, 11.6, 12.7, 13.7, 16.0, 16.3], :text=>[\"01/24 00:00\", \"01/25 00:00\", \"01/26 00:00\", \"01/28 00:00\", \"01/29 00:00\", \"01/30 00:00\", \"01/31 00:00\", \"02/04 00:00\", \"02/06 00:00\"], :name=>\"alcohol\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#7f7f7f\"}}, {:x=>[604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0], :y=>[34.4, 40.0, 43.2, 40.6, 38.4, 36.0, 34.0, 29.700000000000003, 25.200000000000003, 22.099999999999998, 18.2, 12.8, 8.5, 5.3999999999999995, 3.8000000000000003, -0.0], :text=>[\"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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\"], :name=>\"bmd\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#bcbd22\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800, 259200, 345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200, 1209600, 1296000, 1382400, 1468800, 1555200, 1641600, 1728000, 1814400, 1900800, 1987200, 2073600], :ticktext=>[\"添\", \"踊\", \"踊\", \"仲\", \"留\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\", \"13\", \"14\", \"15\", \"16\", \"17\", \"18\", \"19\", \"20\", \"21\", \"22\"]}, :annotations=>[{:x=>0.0, :y=>14.8, :xref=>\"x\", :yref=>\"y\", :text=>\"添\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>259200.0, :y=>6.9, :xref=>\"x\", :yref=>\"y\", :text=>\"仲\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>345600.0, :y=>7.5, :xref=>\"x\", :yref=>\"y\", :text=>\"留\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
37
+ "#<Plotly::Offline::HTML:0x00007fcb359c7630 @id=\"272793dc-9372-41f1-8825-1cd144668cf7\", @data=[{:x=>[0.0, 1.0, 86400.0, 172800.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, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1555200.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0, 2073600.0], :y=>[14.8, 11.0, 14.3, 11.3, 6.9, 10.6, 7.5, 8.0, 9.1, 10.4, 11.9, 12.3, 13.1, 13.1, 12.9, 12.8, 12.9, 12.6, 12.0, 11.2, 10.2, 9.7, 9.8, 9.1, 8.4, 8.1, 8.3, 8.1], :text=>[\"01/16 00:00\", \"01/16 00:00\", \"01/17 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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/03 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\", \"02/09 00:00\"], :name=>\"temps\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#1f77b4\"}}, {:x=>[0.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, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1555200.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0, 2073600.0], :y=>[9, 9, 8.5, 9, 6, 7, 7, 8, 8, 7.5, 7.5, 7.5, 7.0, 8.0, 8.0, 7.0, 7.0, 6.5, 7.0, 8.0, 6.0, 5.0, 5.0, 7.0, 6.0], :text=>[\"01/16 00: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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/03 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\", \"02/09 00:00\"], :name=>\"room_temp\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#2ca02c\"}}, {:x=>[604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0], :y=>[8.6, 8.0, 7.2, 5.8, 4.8, 4.0, 3.4, 2.7, 2.1, 1.7, 1.3, 0.8, 0.5, 0.3, 0.2, -0.0], :text=>[\"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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\"], :name=>\"baume\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#9467bd\"}}, {:x=>[691200.0, 777600.0, 864000.0, 1036800.0, 1123200.0, 1209600.0, 1296000.0, 1641600.0, 1814400.0], :y=>[4.8, 6.75, 7.992, 10.7, 11.6, 12.7, 13.7, 16.0, 16.3], :text=>[\"01/24 00:00\", \"01/25 00:00\", \"01/26 00:00\", \"01/28 00:00\", \"01/29 00:00\", \"01/30 00:00\", \"01/31 00:00\", \"02/04 00:00\", \"02/06 00:00\"], :name=>\"alcohol\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#7f7f7f\"}}, {:x=>[604800.0, 691200.0, 777600.0, 864000.0, 950400.0, 1036800.0, 1123200.0, 1209600.0, 1296000.0, 1382400.0, 1468800.0, 1641600.0, 1728000.0, 1814400.0, 1900800.0, 1987200.0], :y=>[34.4, 40.0, 43.2, 40.6, 38.4, 36.0, 34.0, 29.700000000000003, 25.200000000000003, 22.099999999999998, 18.2, 12.8, 8.5, 5.3999999999999995, 3.8000000000000003, -0.0], :text=>[\"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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\"], :name=>\"bmd\", :line=>{:dash=>:solid, :shape=>:linear}, :marker=>{:color=>\"#bcbd22\"}}], @layout={:xaxis=>{:dtick=>86400, :tickvals=>[0, 86400, 172800, 259200, 345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200, 1209600, 1296000, 1382400, 1468800, 1555200, 1641600, 1728000, 1814400, 1900800, 1987200, 2073600], :ticktext=>[\"添\", \"踊\", \"踊\", \"仲\", \"留\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\", \"13\", \"14\", \"15\", \"16\", \"17\", \"18\", \"19\", \"20\", \"21\", \"22\"]}, :annotations=>[{:x=>0.0, :y=>14.8, :xref=>\"x\", :yref=>\"y\", :text=>\"添\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>259200.0, :y=>6.9, :xref=>\"x\", :yref=>\"y\", :text=>\"仲\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}, {:x=>345600.0, :y=>7.5, :xref=>\"x\", :yref=>\"y\", :text=>\"留\", :showarrow=>true, :arrowhead=>1, :ax=>0, :ay=>-40}]}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
38
38
  ]
39
39
  },
40
40
  "metadata": {},
@@ -49,25 +49,25 @@
49
49
  " </script>\n",
50
50
  "\n",
51
51
  "\n",
52
- "<div id=\"7eb61d12-042e-4b84-9373-06ec2c071d79\" style=\"height: 100%; width: 100%;\"></div>\n",
52
+ "<div id=\"40bfdcba-e736-424c-8e4f-4d06dfc22e16\" style=\"height: 100%; width: 100%;\"></div>\n",
53
53
  "\n",
54
54
  "<script>\n",
55
55
  " require(['plotly'], function(Plotly) { \n",
56
56
  "Plotly.newPlot(\n",
57
- " '7eb61d12-042e-4b84-9373-06ec2c071d79',\n",
57
+ " '40bfdcba-e736-424c-8e4f-4d06dfc22e16',\n",
58
58
  " [{\"type\":\"table\",\"header\":{\"values\":[\"day_label\",\"display_time\",\"mark\",\"temps\",\"room_temp\",\"display_baume\",\"alcohol\",\"bmd\"]},\"cells\":{\"values\":[[\"添\",\"踊\",\"踊\",\"仲\",\"留\",\"2\",\"3\",\"4\",\"5\",\"6\",\"7\",\"8\",\"9\",\"10\",\"11\",\"12\",\"13\",\"14\",\"15\",\"16\",\"17\",\"18\",\"19\",\"20\",\"21\"],[\"01/16 00: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\",\"01/30 00:00\",\"01/31 00:00\",\"02/01 00:00\",\"02/02 00:00\",\"02/03 00:00\",\"02/04 00:00\",\"02/05 00:00\",\"02/06 00:00\",\"02/07 00:00\",\"02/08 00:00\",\"02/09 00:00\"],[\"添\",\"\",\"\",\"仲\",\"留\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\"],[\"14.8, 11.0\",\"14.3\",\"11.3\",\"6.9, 10.6\",\"7.5, 8.0\",\"9.1\",\"10.4\",\"11.9\",\"12.3\",\"13.1\",\"13.1\",\"12.9\",\"12.8\",\"12.9\",\"12.6\",\"12.0\",\"11.2\",\"10.2\",\"9.7\",\"9.8\",\"9.1\",\"8.4\",\"8.1\",\"8.3\",\"8.1\"],[\"9\",\"9\",\"8.5\",\"9\",\"6\",\"7\",\"7\",\"8\",\"8\",\"7.5\",\"7.5\",\"7.5\",\"7.0\",\"8.0\",\"8.0\",\"7.0\",\"7.0\",\"6.5\",\"7.0\",\"8.0\",\"6.0\",\"5.0\",\"5.0\",\"7.0\",\"6.0\"],[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"8.6\",\"8.0\",\"7.2\",\"5.8\",\"4.8\",\"4.0\",\"3.4\",\"-27.0\",\"-21.0\",\"-17.0\",\"-13.0\",\"\",\"-8.0\",\"-5.0\",\"-3.0\",\"-2.0\",\"0.0\",\"\"],[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"4.8\",\"6.75\",\"7.992\",\"\",\"10.7\",\"11.6\",\"12.7\",\"13.7\",\"\",\"\",\"\",\"16.0\",\"\",\"16.3\",\"\",\"\",\"\"],[\"\",\"\",\"\",\"\",\"\",\"\",\"\",\"34.4\",\"40.0\",\"43.2\",\"40.6\",\"38.4\",\"36.0\",\"34.0\",\"29.7\",\"25.2\",\"22.1\",\"18.2\",\"\",\"12.8\",\"8.5\",\"5.4\",\"3.8\",\"-0.0\",\"\"]]}}],\n",
59
59
  " {\"height\":1000},\n",
60
60
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
61
61
  ")\n",
62
62
  "\n",
63
63
  "window.addEventListener('resize', function() {\n",
64
- " Plotly.Plots.resize(document.getElementById('7eb61d12-042e-4b84-9373-06ec2c071d79'))\n",
64
+ " Plotly.Plots.resize(document.getElementById('40bfdcba-e736-424c-8e4f-4d06dfc22e16'))\n",
65
65
  "})\n",
66
66
  " }) \n",
67
67
  "</script>"
68
68
  ],
69
69
  "text/plain": [
70
- "#<Plotly::Offline::HTML:0x00007fe5752c8690 @id=\"7eb61d12-042e-4b84-9373-06ec2c071d79\", @data=[{:type=>:table, :header=>{:values=>[:day_label, :display_time, :mark, :temps, :room_temp, :display_baume, :alcohol, :bmd]}, :cells=>{:values=>[[\"添\", \"踊\", \"踊\", \"仲\", \"留\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\", \"13\", \"14\", \"15\", \"16\", \"17\", \"18\", \"19\", \"20\", \"21\"], [\"01/16 00: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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/03 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\", \"02/09 00:00\"], [\"添\", \"\", \"\", \"仲\", \"留\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\"], [\"14.8, 11.0\", \"14.3\", \"11.3\", \"6.9, 10.6\", \"7.5, 8.0\", \"9.1\", \"10.4\", \"11.9\", \"12.3\", \"13.1\", \"13.1\", \"12.9\", \"12.8\", \"12.9\", \"12.6\", \"12.0\", \"11.2\", \"10.2\", \"9.7\", \"9.8\", \"9.1\", \"8.4\", \"8.1\", \"8.3\", \"8.1\"], [\"9\", \"9\", \"8.5\", \"9\", \"6\", \"7\", \"7\", \"8\", \"8\", \"7.5\", \"7.5\", \"7.5\", \"7.0\", \"8.0\", \"8.0\", \"7.0\", \"7.0\", \"6.5\", \"7.0\", \"8.0\", \"6.0\", \"5.0\", \"5.0\", \"7.0\", \"6.0\"], [\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"8.6\", \"8.0\", \"7.2\", \"5.8\", \"4.8\", \"4.0\", \"3.4\", \"-27.0\", \"-21.0\", \"-17.0\", \"-13.0\", \"\", \"-8.0\", \"-5.0\", \"-3.0\", \"-2.0\", \"0.0\", \"\"], [\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"4.8\", \"6.75\", \"7.992\", \"\", \"10.7\", \"11.6\", \"12.7\", \"13.7\", \"\", \"\", \"\", \"16.0\", \"\", \"16.3\", \"\", \"\", \"\"], [\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"34.4\", \"40.0\", \"43.2\", \"40.6\", \"38.4\", \"36.0\", \"34.0\", \"29.7\", \"25.2\", \"22.1\", \"18.2\", \"\", \"12.8\", \"8.5\", \"5.4\", \"3.8\", \"-0.0\", \"\"]]}}], @layout={:height=>1000}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
70
+ "#<Plotly::Offline::HTML:0x00007fcb349724d8 @id=\"40bfdcba-e736-424c-8e4f-4d06dfc22e16\", @data=[{:type=>:table, :header=>{:values=>[:day_label, :display_time, :mark, :temps, :room_temp, :display_baume, :alcohol, :bmd]}, :cells=>{:values=>[[\"添\", \"踊\", \"踊\", \"仲\", \"留\", \"2\", \"3\", \"4\", \"5\", \"6\", \"7\", \"8\", \"9\", \"10\", \"11\", \"12\", \"13\", \"14\", \"15\", \"16\", \"17\", \"18\", \"19\", \"20\", \"21\"], [\"01/16 00: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\", \"01/30 00:00\", \"01/31 00:00\", \"02/01 00:00\", \"02/02 00:00\", \"02/03 00:00\", \"02/04 00:00\", \"02/05 00:00\", \"02/06 00:00\", \"02/07 00:00\", \"02/08 00:00\", \"02/09 00:00\"], [\"添\", \"\", \"\", \"仲\", \"留\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\"], [\"14.8, 11.0\", \"14.3\", \"11.3\", \"6.9, 10.6\", \"7.5, 8.0\", \"9.1\", \"10.4\", \"11.9\", \"12.3\", \"13.1\", \"13.1\", \"12.9\", \"12.8\", \"12.9\", \"12.6\", \"12.0\", \"11.2\", \"10.2\", \"9.7\", \"9.8\", \"9.1\", \"8.4\", \"8.1\", \"8.3\", \"8.1\"], [\"9\", \"9\", \"8.5\", \"9\", \"6\", \"7\", \"7\", \"8\", \"8\", \"7.5\", \"7.5\", \"7.5\", \"7.0\", \"8.0\", \"8.0\", \"7.0\", \"7.0\", \"6.5\", \"7.0\", \"8.0\", \"6.0\", \"5.0\", \"5.0\", \"7.0\", \"6.0\"], [\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"8.6\", \"8.0\", \"7.2\", \"5.8\", \"4.8\", \"4.0\", \"3.4\", \"-27.0\", \"-21.0\", \"-17.0\", \"-13.0\", \"\", \"-8.0\", \"-5.0\", \"-3.0\", \"-2.0\", \"0.0\", \"\"], [\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"\", \"4.8\", \"6.75\", \"7.992\", \"\", \"10.7\", \"11.6\", \"12.7\", \"13.7\", \"\", \"\", \"\", \"16.0\", \"\", \"16.3\", \"\", \"\", \"\"], [\"\", \"\", \"\", \"\", \"\", \"\", \"\", \"34.4\", \"40.0\", \"43.2\", \"40.6\", \"38.4\", \"36.0\", \"34.0\", \"29.7\", \"25.2\", \"22.1\", \"18.2\", \"\", \"12.8\", \"8.5\", \"5.4\", \"3.8\", \"-0.0\", \"\"]]}}], @layout={:height=>1000}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
71
71
  ]
72
72
  },
73
73
  "metadata": {},
@@ -82,25 +82,25 @@
82
82
  " </script>\n",
83
83
  "\n",
84
84
  "\n",
85
- "<div id=\"1cbb8a13-f102-482a-8367-a98d4f4e480a\" style=\"height: 100%; width: 100%;\"></div>\n",
85
+ "<div id=\"de0d0384-18c6-4c4c-8844-88c98d6bbb45\" style=\"height: 100%; width: 100%;\"></div>\n",
86
86
  "\n",
87
87
  "<script>\n",
88
88
  " require(['plotly'], function(Plotly) { \n",
89
89
  "Plotly.newPlot(\n",
90
- " '1cbb8a13-f102-482a-8367-a98d4f4e480a',\n",
90
+ " 'de0d0384-18c6-4c4c-8844-88c98d6bbb45',\n",
91
91
  " [{\"x\":[345600,432000,518400,604800,691200,777600,864000,950400,1036800,1123200,1209600,1382400,1468800,1555200,1641600,1728000],\"y\":[34.4,40.0,43.2,40.6,38.4,36.0,34.0,29.700000000000003,25.200000000000003,22.099999999999998,18.2,12.8,8.5,5.3999999999999995,3.8000000000000003,-0.0],\"text\":[\"01/23 00:00\\u003cbr /\\u003emoromi day=4, be=8.6, bmd=34.4\",\"01/24 00:00\\u003cbr /\\u003emoromi day=5, be=8.0, bmd=40.0\",\"01/25 00:00\\u003cbr /\\u003emoromi day=6, be=7.2, bmd=43.2\",\"01/26 00:00\\u003cbr /\\u003emoromi day=7, be=5.8, bmd=40.6\",\"01/27 00:00\\u003cbr /\\u003emoromi day=8, be=4.8, bmd=38.4\",\"01/28 00:00\\u003cbr /\\u003emoromi day=9, be=4.0, bmd=36.0\",\"01/29 00:00\\u003cbr /\\u003emoromi day=10, be=3.4, bmd=34.0\",\"01/30 00:00\\u003cbr /\\u003emoromi day=11, be=2.7, bmd=29.700000000000003\",\"01/31 00:00\\u003cbr /\\u003emoromi day=12, be=2.1, bmd=25.200000000000003\",\"02/01 00:00\\u003cbr /\\u003emoromi day=13, be=1.7, bmd=22.099999999999998\",\"02/02 00:00\\u003cbr /\\u003emoromi day=14, be=1.3, bmd=18.2\",\"02/04 00:00\\u003cbr /\\u003emoromi day=16, be=0.8, bmd=12.8\",\"02/05 00:00\\u003cbr /\\u003emoromi day=17, be=0.5, bmd=8.5\",\"02/06 00:00\\u003cbr /\\u003emoromi day=18, be=0.3, bmd=5.3999999999999995\",\"02/07 00:00\\u003cbr /\\u003emoromi day=19, be=0.2, bmd=3.8000000000000003\",\"02/08 00:00\\u003cbr /\\u003emoromi day=20, be=-0.0, bmd=-0.0\"],\"name\":\"actual\"}],\n",
92
92
  " {\"xaxis\":{\"title\":\"Moromi day\",\"dtick\":86400,\"range\":[86400,1814400],\"tickvals\":[0,86400,172800,259200,345600,432000,518400,604800,691200,777600,864000,950400,1036800,1123200,1209600,1296000,1382400,1468800,1555200,1641600,1728000],\"ticktext\":[1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]},\"yaxis\":{\"title\":\"BMD\"}},\n",
93
93
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
94
94
  ")\n",
95
95
  "\n",
96
96
  "window.addEventListener('resize', function() {\n",
97
- " Plotly.Plots.resize(document.getElementById('1cbb8a13-f102-482a-8367-a98d4f4e480a'))\n",
97
+ " Plotly.Plots.resize(document.getElementById('de0d0384-18c6-4c4c-8844-88c98d6bbb45'))\n",
98
98
  "})\n",
99
99
  " }) \n",
100
100
  "</script>"
101
101
  ],
102
102
  "text/plain": [
103
- "#<Plotly::Offline::HTML:0x00007fe5753222d0 @id=\"1cbb8a13-f102-482a-8367-a98d4f4e480a\", @data=[{:x=>[345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200, 1209600, 1382400, 1468800, 1555200, 1641600, 1728000], :y=>[34.4, 40.0, 43.2, 40.6, 38.4, 36.0, 34.0, 29.700000000000003, 25.200000000000003, 22.099999999999998, 18.2, 12.8, 8.5, 5.3999999999999995, 3.8000000000000003, -0.0], :text=>[\"01/23 00:00<br />moromi day=4, be=8.6, bmd=34.4\", \"01/24 00:00<br />moromi day=5, be=8.0, bmd=40.0\", \"01/25 00:00<br />moromi day=6, be=7.2, bmd=43.2\", \"01/26 00:00<br />moromi day=7, be=5.8, bmd=40.6\", \"01/27 00:00<br />moromi day=8, be=4.8, bmd=38.4\", \"01/28 00:00<br />moromi day=9, be=4.0, bmd=36.0\", \"01/29 00:00<br />moromi day=10, be=3.4, bmd=34.0\", \"01/30 00:00<br />moromi day=11, be=2.7, bmd=29.700000000000003\", \"01/31 00:00<br />moromi day=12, be=2.1, bmd=25.200000000000003\", \"02/01 00:00<br />moromi day=13, be=1.7, bmd=22.099999999999998\", \"02/02 00:00<br />moromi day=14, be=1.3, bmd=18.2\", \"02/04 00:00<br />moromi day=16, be=0.8, bmd=12.8\", \"02/05 00:00<br />moromi day=17, be=0.5, bmd=8.5\", \"02/06 00:00<br />moromi day=18, be=0.3, bmd=5.3999999999999995\", \"02/07 00:00<br />moromi day=19, be=0.2, bmd=3.8000000000000003\", \"02/08 00:00<br />moromi day=20, be=-0.0, bmd=-0.0\"], :name=>:actual}], @layout={:xaxis=>{:title=>\"Moromi day\", :dtick=>86400, :range=>[86400, 1814400], :tickvals=>[0, 86400, 172800, 259200, 345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200, 1209600, 1296000, 1382400, 1468800, 1555200, 1641600, 1728000], :ticktext=>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]}, :yaxis=>{:title=>\"BMD\"}}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
103
+ "#<Plotly::Offline::HTML:0x00007fcb349a99b0 @id=\"de0d0384-18c6-4c4c-8844-88c98d6bbb45\", @data=[{:x=>[345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200, 1209600, 1382400, 1468800, 1555200, 1641600, 1728000], :y=>[34.4, 40.0, 43.2, 40.6, 38.4, 36.0, 34.0, 29.700000000000003, 25.200000000000003, 22.099999999999998, 18.2, 12.8, 8.5, 5.3999999999999995, 3.8000000000000003, -0.0], :text=>[\"01/23 00:00<br />moromi day=4, be=8.6, bmd=34.4\", \"01/24 00:00<br />moromi day=5, be=8.0, bmd=40.0\", \"01/25 00:00<br />moromi day=6, be=7.2, bmd=43.2\", \"01/26 00:00<br />moromi day=7, be=5.8, bmd=40.6\", \"01/27 00:00<br />moromi day=8, be=4.8, bmd=38.4\", \"01/28 00:00<br />moromi day=9, be=4.0, bmd=36.0\", \"01/29 00:00<br />moromi day=10, be=3.4, bmd=34.0\", \"01/30 00:00<br />moromi day=11, be=2.7, bmd=29.700000000000003\", \"01/31 00:00<br />moromi day=12, be=2.1, bmd=25.200000000000003\", \"02/01 00:00<br />moromi day=13, be=1.7, bmd=22.099999999999998\", \"02/02 00:00<br />moromi day=14, be=1.3, bmd=18.2\", \"02/04 00:00<br />moromi day=16, be=0.8, bmd=12.8\", \"02/05 00:00<br />moromi day=17, be=0.5, bmd=8.5\", \"02/06 00:00<br />moromi day=18, be=0.3, bmd=5.3999999999999995\", \"02/07 00:00<br />moromi day=19, be=0.2, bmd=3.8000000000000003\", \"02/08 00:00<br />moromi day=20, be=-0.0, bmd=-0.0\"], :name=>:actual}], @layout={:xaxis=>{:title=>\"Moromi day\", :dtick=>86400, :range=>[86400, 1814400], :tickvals=>[0, 86400, 172800, 259200, 345600, 432000, 518400, 604800, 691200, 777600, 864000, 950400, 1036800, 1123200, 1209600, 1296000, 1382400, 1468800, 1555200, 1641600, 1728000], :ticktext=>[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21]}, :yaxis=>{:title=>\"BMD\"}}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
104
104
  ]
105
105
  },
106
106
  "metadata": {},
@@ -115,25 +115,25 @@
115
115
  " </script>\n",
116
116
  "\n",
117
117
  "\n",
118
- "<div id=\"be5e3e28-c1f7-4993-b255-596bf278f355\" style=\"height: 100%; width: 100%;\"></div>\n",
118
+ "<div id=\"cd2673f5-b709-4201-9b57-2de7b15c31bf\" style=\"height: 100%; width: 100%;\"></div>\n",
119
119
  "\n",
120
120
  "<script>\n",
121
121
  " require(['plotly'], function(Plotly) { \n",
122
122
  "Plotly.newPlot(\n",
123
- " 'be5e3e28-c1f7-4993-b255-596bf278f355',\n",
123
+ " 'cd2673f5-b709-4201-9b57-2de7b15c31bf',\n",
124
124
  " [{\"x\":[4.8,6.75,7.992,10.7,11.6,12.7,13.7,16.0,16.3],\"y\":[8.0,7.2,5.8,4.0,3.4,2.7,2.1,0.8,0.3],\"text\":[\"01/24 00:00\\u003cbr /\\u003ealc=4.8, be=8.0\",\"01/25 00:00\\u003cbr /\\u003ealc=6.75, be=7.2\",\"01/26 00:00\\u003cbr /\\u003ealc=7.992, be=5.8\",\"01/28 00:00\\u003cbr /\\u003ealc=10.7, be=4.0\",\"01/29 00:00\\u003cbr /\\u003ealc=11.6, be=3.4\",\"01/30 00:00\\u003cbr /\\u003ealc=12.7, be=2.7\",\"01/31 00:00\\u003cbr /\\u003ealc=13.7, be=2.1\",\"02/04 00:00\\u003cbr /\\u003ealc=16.0, be=0.8\",\"02/06 00:00\\u003cbr /\\u003ealc=16.3, be=0.3\"],\"name\":\"actual\"},{\"x\":[16.08,4.879999999999999],\"y\":[0.0,8.0],\"name\":\"+3.0 16.5\"},{\"x\":[16.58,5.379999999999999],\"y\":[0.0,8.0],\"name\":\"+3.0 17.0\"},{\"x\":[16.5,5.300000000000001],\"y\":[0.0,8.0],\"name\":\"+0.0 16.5\"}],\n",
125
125
  " {\"xaxis\":{\"title\":\"Alcohol\",\"dtick\":2,\"range\":[0,20]},\"yaxis\":{\"title\":\"Baume\",\"dtick\":1,\"range\":[0,10]}},\n",
126
126
  " {\"linkText\":\"Export to plot.ly\",\"showLink\":true}\n",
127
127
  ")\n",
128
128
  "\n",
129
129
  "window.addEventListener('resize', function() {\n",
130
- " Plotly.Plots.resize(document.getElementById('be5e3e28-c1f7-4993-b255-596bf278f355'))\n",
130
+ " Plotly.Plots.resize(document.getElementById('cd2673f5-b709-4201-9b57-2de7b15c31bf'))\n",
131
131
  "})\n",
132
132
  " }) \n",
133
133
  "</script>"
134
134
  ],
135
135
  "text/plain": [
136
- "#<Plotly::Offline::HTML:0x00007fe575351b70 @id=\"be5e3e28-c1f7-4993-b255-596bf278f355\", @data=[{:x=>[4.8, 6.75, 7.992, 10.7, 11.6, 12.7, 13.7, 16.0, 16.3], :y=>[8.0, 7.2, 5.8, 4.0, 3.4, 2.7, 2.1, 0.8, 0.3], :text=>[\"01/24 00:00<br />alc=4.8, be=8.0\", \"01/25 00:00<br />alc=6.75, be=7.2\", \"01/26 00:00<br />alc=7.992, be=5.8\", \"01/28 00:00<br />alc=10.7, be=4.0\", \"01/29 00:00<br />alc=11.6, be=3.4\", \"01/30 00:00<br />alc=12.7, be=2.7\", \"01/31 00:00<br />alc=13.7, be=2.1\", \"02/04 00:00<br />alc=16.0, be=0.8\", \"02/06 00:00<br />alc=16.3, be=0.3\"], :name=>:actual}, {:x=>[16.08, 4.879999999999999], :y=>[0.0, 8.0], :name=>\"+3.0 16.5\"}, {:x=>[16.58, 5.379999999999999], :y=>[0.0, 8.0], :name=>\"+3.0 17.0\"}, {:x=>[16.5, 5.300000000000001], :y=>[0.0, 8.0], :name=>\"+0.0 16.5\"}], @layout={:xaxis=>{:title=>\"Alcohol\", :dtick=>2, :range=>[0, 20]}, :yaxis=>{:title=>\"Baume\", :dtick=>1, :range=>[0, 10]}}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
136
+ "#<Plotly::Offline::HTML:0x00007fcb349e2f58 @id=\"cd2673f5-b709-4201-9b57-2de7b15c31bf\", @data=[{:x=>[4.8, 6.75, 7.992, 10.7, 11.6, 12.7, 13.7, 16.0, 16.3], :y=>[8.0, 7.2, 5.8, 4.0, 3.4, 2.7, 2.1, 0.8, 0.3], :text=>[\"01/24 00:00<br />alc=4.8, be=8.0\", \"01/25 00:00<br />alc=6.75, be=7.2\", \"01/26 00:00<br />alc=7.992, be=5.8\", \"01/28 00:00<br />alc=10.7, be=4.0\", \"01/29 00:00<br />alc=11.6, be=3.4\", \"01/30 00:00<br />alc=12.7, be=2.7\", \"01/31 00:00<br />alc=13.7, be=2.1\", \"02/04 00:00<br />alc=16.0, be=0.8\", \"02/06 00:00<br />alc=16.3, be=0.3\"], :name=>:actual}, {:x=>[16.08, 4.879999999999999], :y=>[0.0, 8.0], :name=>\"+3.0 16.5\"}, {:x=>[16.58, 5.379999999999999], :y=>[0.0, 8.0], :name=>\"+3.0 17.0\"}, {:x=>[16.5, 5.300000000000001], :y=>[0.0, 8.0], :name=>\"+0.0 16.5\"}], @layout={:xaxis=>{:title=>\"Alcohol\", :dtick=>2, :range=>[0, 20]}, :yaxis=>{:title=>\"Baume\", :dtick=>1, :range=>[0, 10]}}, @config={:linkText=>\"Export to plot.ly\", :showLink=>true}, @embedded=true>"
137
137
  ]
138
138
  },
139
139
  "metadata": {},
@@ -142,10 +142,10 @@
142
142
  {
143
143
  "data": {
144
144
  "text/plain": [
145
- "#<CZTop::Socket::PUB:0x7fe5759f3ab0 last_endpoint=\"tcp://127.0.0.1:54895\">"
145
+ "#<CZTop::Socket::PUB:0x7fcb37546560 last_endpoint=\"tcp://127.0.0.1:59733\">"
146
146
  ]
147
147
  },
148
- "execution_count": 4,
148
+ "execution_count": 1,
149
149
  "metadata": {},
150
150
  "output_type": "execute_result"
151
151
  }
@@ -156,9 +156,9 @@
156
156
  "require './example_core'\n",
157
157
  "require 'rbplotly'\n",
158
158
  "\n",
159
- "moromi = Example::Brew::Moromi.load_yaml_file(\"moromi.yaml\")\n",
160
- "moromi.progress.plot.show\n",
161
- "moromi.progress.table.tap{|t| t.layout.height=1000}.show\n",
159
+ "moromi = Example::Progress::MoromiProgress.load_yaml_file(\"moromi_progress.yaml\")\n",
160
+ "moromi.progress_note.plot.show\n",
161
+ "moromi.progress_note.table.tap{|t| t.layout.height=1000}.show\n",
162
162
  "moromi.bmd.plot.show\n",
163
163
  "\n",
164
164
  "moromi.ab(1.4)\n",