toji 0.1.0 → 1.0.0

data/lib/toji/{progress → product}/moromi.rb

@@ -1,7 +1,6 @@
 module Toji
-  module Progress
-    class Moromi
-      extend JobAccessor
+  module Product
+    class Moromi < Base
 
       TEMPLATES = {
         default: [
@@ -9,157 +8,154 @@ module Toji
             time: Time.mktime(2019, 1, 16),
             id: :soe,
             room_temp: 9,
-            before_temp: 14.8,
-            after_temp: 11.0,
+            temps: [14.8, 11.0],
           ),
           Job.new(
             time: Time.mktime(2019, 1, 17),
             room_temp: 9,
-            before_temp: 14.3,
+            temps: 14.3,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 18),
             room_temp: 8.5,
-            before_temp: 11.3,
+            temps: 11.3,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 19),
             id: :naka,
             room_temp: 9,
-            before_temp: 6.9,
-            after_temp: 10.6,
+            temps: [6.9, 10.6],
           ),
           Job.new(
             time: Time.mktime(2019, 1, 20),
             id: :tome,
             room_temp: 6,
-            before_temp: 7.5,
-            after_temp: 8.0,
+            temps: [7.5, 8.0],
           ),
           Job.new(
             time: Time.mktime(2019, 1, 21),
             room_temp: 7,
-            before_temp: 9.1,
+            temps: 9.1,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 22),
             room_temp: 7,
-            before_temp: 10.4,
+            temps: 10.4,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 23),
             room_temp: 8,
-            before_temp: 11.9,
+            temps: 11.9,
             baume: 8.6,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 24),
             room_temp: 8,
-            before_temp: 12.3,
+            temps: 12.3,
             baume: 8.0,
             alcohol: 4.8,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 25),
             room_temp: 7.5,
-            before_temp: 13.1,
+            temps: 13.1,
             baume: 7.2,
             alcohol: 6.75,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 26),
             room_temp: 7.5,
-            before_temp: 13.1,
+            temps: 13.1,
             baume: 5.8,
             alcohol: 7.992,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 27),
             room_temp: 7.5,
-            before_temp: 12.9,
+            temps: 12.9,
             baume: 4.8,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 28),
             room_temp: 7.0,
-            before_temp: 12.8,
+            temps: 12.8,
             baume: 4.0,
             alcohol: 10.7,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 29),
             room_temp: 8.0,
-            before_temp: 12.9,
+            temps: 12.9,
             baume: 3.4,
             alcohol: 11.6,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 30),
             room_temp: 8.0,
-            before_temp: 12.6,
+            temps: 12.6,
             nihonshudo: -27,
             alcohol: 12.7,
           ),
           Job.new(
             time: Time.mktime(2019, 1, 31),
             room_temp: 7.0,
-            before_temp: 12.0,
+            temps: 12.0,
             nihonshudo: -21,
             alcohol: 13.7,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 1),
             room_temp: 7.0,
-            before_temp: 11.2,
+            temps: 11.2,
             nihonshudo: -17,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 2),
             room_temp: 6.5,
-            before_temp: 10.2,
+            temps: 10.2,
             nihonshudo: -13,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 3),
             room_temp: 7.0,
-            before_temp: 9.7,
+            temps: 9.7,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 4),
             room_temp: 8.0,
-            before_temp: 9.8,
+            temps: 9.8,
             nihonshudo: -8,
             alcohol: 16.0,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 5),
             room_temp: 6.0,
-            before_temp: 9.1,
+            temps: 9.1,
             nihonshudo: -5,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 6),
             room_temp: 5.0,
-            before_temp: 8.4,
+            temps: 8.4,
             nihonshudo: -3,
             alcohol: 16.3,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 7),
             room_temp: 5.0,
-            before_temp: 8.1,
+            temps: 8.1,
             nihonshudo: -2,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 8),
             room_temp: 7.0,
-            before_temp: 8.3,
+            temps: 8.3,
             nihonshudo: 0,
           ),
           Job.new(
             time: Time.mktime(2019, 2, 9),
             room_temp: 6.0,
-            before_temp: 8.1,
+            temps: 8.1,
           ),
         ],
       }
@@ -170,102 +166,66 @@ module Toji
       job_reader :naka
       job_reader :tome
 
-      def initialize(jobs=[])
-        @jobs = Jobs.new(jobs)
-      end
-
-      def add(job)
-        @jobs << job
-        self
-      end
-
-      def jobs
-        @jobs.to_a
-      end
+      def initialize(jobs=[], date_line: 0, day_labels: nil)
+        super(jobs, date_line: date_line)
 
-      def days
-        (jobs.last.elapsed_time.to_f / Job::DAY).ceil + 1
+        if day_labels
+          @day_labels = [day_labels].flatten
+        end
       end
 
       def moromi_days
-        tome = @jobs[:tome]
-        if tome
-          tome_day = (tome.elapsed_time.to_f / Job::DAY).floor + 1
-          days - tome_day
+        if @day_labels
+          days - @day_labels.length
+        else
+          tome = self[:tome]
+          if tome
+            tome_day = (tome.elapsed_time.to_f / Job::DAY).floor + 1
+            days - tome_day
+          end
         end
       end
 
       def day_labels
-        texts = Array.new(days)
-        [:soe, :naka, :tome].each {|id|
-          j = jobs.select{|j| j.id==id}.first
-          if j
-            i = ((j.elapsed_time + @jobs.day_offset) / Job::DAY.to_f).floor
-            texts[i] = id
-          end
-        }
-
-        soe_i = texts.index(:soe)
-        tome_i = texts.index(:tome)
-        moromi_day = 1
-        texts.map.with_index {|text,i|
-          if text
-            text
-          elsif !soe_i || i<soe_i
-            :moto
-          elsif !tome_i || i<tome_i
-            :odori
-          else
-            moromi_day += 1
-          end
-        }
-      end
-
-      def plot_data
-        @jobs.plot_data
-      end
+        if @day_labels
+          @day_labels + moromi_days.times.map{|i| i+2}
+        else
+          texts = Array.new(days)
+          [:soe, :naka, :tome].each {|id|
+            j = select{|j| j.id==id}.first
+            if j
+              i = ((j.elapsed_time + day_offset) / Job::DAY.to_f).floor
+              texts[i] = id
+            end
+          }
 
-      def plot
-        Plotly::Plot.new(
-          data: plot_data,
-          layout: {
-            xaxis: {
-              dtick: Job::DAY,
-              tickvals: days.times.map{|d| d*Job::DAY},
-              ticktext: day_labels
-            }
+          soe_i = texts.index(:soe)
+          tome_i = texts.index(:tome)
+          moromi_day = 1
+          texts.map.with_index {|text,i|
+            if text
+              text
+            elsif !soe_i || i<soe_i
+              :moto
+            elsif !tome_i || i<tome_i
+              :odori
+            else
+              moromi_day += 1
+            end
           }
-        )
+        end
       end
 
-      def bmd_plot_data
-        @jobs.bmd_plot_data
+      def progress
+        Graph::Progress.new(self)
       end
 
-      def bmd_plot
-        data = [bmd_plot_data]
-        max_moromi_day = moromi_days || 0
-        max_moromi_day = [max_moromi_day, 14].max
-
-        Plotly::Plot.new(
-          data: data,
-          layout: {
-            xaxis: {
-              title: "Moromi day",
-              dtick: Job::DAY,
-              range: [1, max_moromi_day].map{|d| d*Job::DAY},
-              tickvals: days.times.map{|d| d*Job::DAY},
-              ticktext: days.times.map(&:succ)
-            },
-            yaxis: {
-              title: "BMD",
-            }
-          }
-        )
+      def bmd
+        Graph::Bmd.new.actual(self)
       end
 
       def ab(coef=1.5)
-        Graph::Ab.new(coef).actual(@jobs)
+        Graph::Ab.new(coef).actual(self)
       end
 
       def self.template(key=:default)

data/lib/toji/{progress → product}/shubo.rb

@@ -1,107 +1,103 @@
 module Toji
-  module Progress
-    class Shubo
-      extend JobAccessor
+  module Product
+    class Shubo < Base
 
       TEMPLATES = {
         default: [
           Job.new(
             elapsed_time: 0 * Job::DAY,
             id: :mizukoji,
-            after_temp: 12.0,
+            temps: 12.0,
             acid: 13.0,
           ),
           Job.new(
             elapsed_time: 0 * Job::DAY + 1 * Job::HOUR,
             id: :shikomi,
-            after_temp: 20.0,
+            temps: 20.0,
             acid: 13.0,
           ),
           Job.new(
             elapsed_time: 1 * Job::DAY,
             id: :utase,
-            after_temp: 14.0,
+            temps: 14.0,
             baume: 15.0,
             acid: 13.0,
           ),
           Job.new(
             elapsed_time: 2 * Job::DAY,
-            before_temp: 8.0,
-            after_temp: 11.0,
+            temps: [8.0, 11.0],
             baume: 16.0,
             acid: 13.0,
             warming: Job::WARM_DAKI,
           ),
           Job.new(
             elapsed_time: 3 * Job::DAY,
-            before_temp: 10.0,
-            after_temp: 13.0,
+            temps: [10.0, 13.0],
             baume: 16.5,
             acid: 13.5,
             warming: Job::WARM_DAKI,
           ),
           Job.new(
             elapsed_time: 4 * Job::DAY,
-            before_temp: 12.0,
-            after_temp: 15.0,
+            temps: [12.0, 15.0],
             baume: 17.0,
             acid: 13.5,
             warming: Job::WARM_DAKI,
           ),
           Job.new(
             elapsed_time: 5 * Job::DAY,
-            after_temp: 14.0,
+            temps: 14.0,
             baume: 17.0,
             acid: 14.0,
             warming: Job::WARM_ANKA,
           ),
           Job.new(
             elapsed_time: 6 * Job::DAY,
-            after_temp: 20.0,
+            temps: 20.0,
             baume: 17.0,
             acid: 14.5,
             warming: Job::WARM_ANKA,
           ),
           Job.new(
             elapsed_time: 7 * Job::DAY,
-            after_temp: 20.0,
+            temps: 20.0,
             baume: 14.0,
             acid: 15.5,
           ),
           Job.new(
             elapsed_time: 8 * Job::DAY,
-            after_temp: 20.0,
+            temps: 20.0,
             baume: 12.0,
             acid: 16.0,
           ),
           Job.new(
             elapsed_time: 9 * Job::DAY,
             id: :wake,
-            after_temp: 20.0,
+            temps: 20.0,
             baume: 9.0,
             acid: 16.0,
           ),
           Job.new(
             elapsed_time: 10 * Job::DAY,
-            after_temp: 15.0,
+            temps: 15.0,
             baume: 8.0,
             acid: 16.5,
           ),
           Job.new(
             elapsed_time: 11 * Job::DAY,
-            after_temp: 12.0,
+            temps: 12.0,
             baume: 7.0,
             acid: 17.0,
           ),
           Job.new(
             elapsed_time: 12 * Job::DAY,
-            after_temp: 10.0,
+            temps: 10.0,
             baume: 6.0,
             acid: 17.5,
           ),
           Job.new(
             elapsed_time: 13 * Job::DAY,
-            after_temp: 9.0,
+            temps: 9.0,
             baume: 5.0,
             acid: 17.5,
           ),
@@ -115,39 +111,15 @@ module Toji
       job_reader :wake
 
       def initialize(jobs=[])
-        @jobs = Jobs.new(jobs)
+        super(jobs)
       end
 
-      def add(job)
-        @jobs << job
-        self
+      def day_labels
+        days.times.map(&:succ)
       end
 
-      def jobs
-        @jobs.to_a
-      end
-
-      def days
-        (jobs.last.elapsed_time.to_f / Job::DAY).ceil + 1
-      end
-
-      def plot_data
-        @jobs.plot_data
-      end
-
-      def plot
-        _days = days
-
-        Plotly::Plot.new(
-          data: plot_data,
-          layout: {
-            xaxis: {
-              dtick: 24*60*60,
-              tickvals: _days.times.map{|d| d*Job::DAY},
-              ticktext: (1.._days).to_a
-            }
-          }
-        )
+      def progress
+        Graph::Progress.new(self)
       end
 
       def self.template(key=:default)

data/lib/toji/product.rb

@@ -0,0 +1,11 @@
+require 'toji/product/job'
+require 'toji/product/job_accessor'
+require 'toji/product/base'
+require 'toji/product/koji_making'
+require 'toji/product/shubo'
+require 'toji/product/moromi'
+
+module Toji
+  module Product
+  end
+end

data/lib/toji/recipe/rice_rate/cooked.rb

@@ -25,31 +25,7 @@ module Toji
         end
 
 
-        DEFAULT = new(0.35, 0.5, 0.40, 0.36)
-
-        @@rates = [
-          #new(0.60, 0.380+0.1, 0.380),
-          #new(0.55, 0.360+0.1, 0.360),
-          #new(0.50, 0.335+0.1, 0.335),
-          new(0.35, 0.5, 0.40, 0.36),
-          new(0.33, 0.45, 0.40, 0.35),
-        ]
-
-        def self.soaked_rate(val)
-          @@rates.select{|r| r.soaked_rate==val}.first
-        end
-
-        def self.before_steaming_rate(val)
-          @@rates.select{|r| r.before_steaming_rate==val}.first
-        end
-
-        def self.steamed_rate(val)
-          @@rates.select{|r| r.steamed_rate==val}.first
-        end
-
-        def self.cooled_rate(val)
-          @@rates.select{|r| r.cooled_rate==val}.first
-        end
+        DEFAULT = new(0.30, 0.5, 0.40, 0.36)
       end
 
 

data/lib/toji/recipe/rice_rate/steamed.rb

@@ -19,18 +19,6 @@ module Toji
 
 
         DEFAULT = new(0.33, nil, 0.41, 0.33)
-
-        def self.soaked_rate(val)
-          @@rates.select{|r| r.soaked_rate==val}.first
-        end
-
-        def self.steamed_rate(val)
-          @@rates.select{|r| r.steamed_rate==val}.first
-        end
-
-        def self.cooled_rate(val)
-          @@rates.select{|r| r.cooled_rate==val}.first
-        end
       end
 
 

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "0.1.0"
+  VERSION = "1.0.0"
 end

data/lib/toji.rb

@@ -3,7 +3,7 @@ require 'active_support/all'
 
 require 'toji/ingredient'
 require 'toji/recipe'
-require 'toji/progress'
+require 'toji/product'
 require 'toji/graph'
 
 module Toji

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,13 +109,21 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/koji_making.ipynb
+- example/koji_making.rb
+- example/koji_making2.rb
 - example/koji_recipe.rb
-- example/make_koji.rb
+- example/moromi.ipynb
+- example/moromi.rb
 - example/rice_recipe.rb
+- example/shubo.ipynb
+- example/shubo.rb
 - example/three_step_mashing_recipe.rb
 - lib/toji.rb
 - lib/toji/graph.rb
 - lib/toji/graph/ab.rb
+- lib/toji/graph/bmd.rb
+- lib/toji/graph/progress.rb
 - lib/toji/ingredient.rb
 - lib/toji/ingredient/koji.rb
 - lib/toji/ingredient/koji/actual.rb
@@ -132,13 +140,13 @@ files:
 - lib/toji/ingredient/yeast.rb
 - lib/toji/ingredient/yeast/base.rb
 - lib/toji/ingredient/yeast/red_star.rb
-- lib/toji/progress.rb
-- lib/toji/progress/job.rb
-- lib/toji/progress/job_accessor.rb
-- lib/toji/progress/jobs.rb
-- lib/toji/progress/make_koji.rb
-- lib/toji/progress/moromi.rb
-- lib/toji/progress/shubo.rb
+- lib/toji/product.rb
+- lib/toji/product/base.rb
+- lib/toji/product/job.rb
+- lib/toji/product/job_accessor.rb
+- lib/toji/product/koji_making.rb
+- lib/toji/product/moromi.rb
+- lib/toji/product/shubo.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/koji_rate.rb
 - lib/toji/recipe/rice_rate.rb

data/example/make_koji.rb

@@ -1,18 +0,0 @@
-require 'toji'
-require 'terminal-table'
-
-make_koji = Toji::Progress::MakeKoji.template
-
-table = Terminal::Table.new do |t|
-  t << ["作業", "品温(度)", "操作室温", "乾湿差(度)", "経過時間"]
-  t << :separator
-  make_koji.jobs.each {|j|
-    if j.before_temp && j.after_temp
-      temp = "%s / %s" % [j.before_temp, j.after_temp]
-    else
-      temp = j.before_temp || j.after_temp
-    end
-    t << [j.id, temp, j.room_temp, j.room_psychrometry, j.elapsed_time]
-  }
-end
-puts table