toji 2.26.0 → 2.27.0

data/lib/toji/progress/moto_state.rb

@@ -3,29 +3,16 @@ module Toji
     module MotoState
       include BaseState
 
-      OPTIONAL_KEYS = [
-        :temps,
-        :preset_temp,
-        :room_temp,
-        :room_psychrometry,
-
+      KEYS = (BaseState::KEYS + [
         :baume,
         :acid,
-
         :warmings,
-        :note,
-      ].freeze
-
-      # @dynamic temps
-      # @dynamic preset_temp
-      # @dynamic room_temp
-      # @dynamic room_psychrometry
+      ]).freeze
 
       # @dynamic baume
       # @dynamic acid
 
       # @dynamic warmings
-      # @dynamic note
     end
   end
 end

data/lib/toji/psychrometry_to_relative_humidity.rb

@@ -0,0 +1,24 @@
+require 'toji/swvp'
+
+module Toji
+  # 乾湿差から相対湿度へ変換
+  class PsychrometryToRelativeHumidity
+    attr_reader :swvp
+    attr_reader :pressure
+    attr_reader :k
+
+    def initialize(swvp: Swvp.default, pressure: 1013, k: 0.000662)
+      @swvp = swvp
+      @pressure = pressure
+      @k = k
+    end
+
+    def convert(t_wet, t_dry)
+      p_wet = swvp.calc(t_wet)
+      p_dry = swvp.calc(t_dry)
+
+      p_w = p_wet - pressure * k * (t_dry - t_wet)
+      p_w / p_dry
+    end
+  end
+end

data/lib/toji/recipe.rb

@@ -56,6 +56,12 @@ module Toji
       steps.map(&:compact!)
       steps.select! {|step| 0<step.ingredients.to_a.length}
 
+      indexes = steps.map{|step| {index: step.index, subindex: step.subindex}}
+      duplicates = indexes - indexes.uniq
+      if 0<duplicates.length
+        raise DuplicateStepIndexError.new(duplicates)
+      end
+
       ab_expects.select! {|ab| ab.alcohol && ab.nihonshudo}
       ab_expects.uniq! {|ab| [ab.alcohol, ab.nihonshudo]}
 

data/lib/toji/swvp.rb

@@ -0,0 +1,12 @@
+require 'toji/swvp/base'
+require 'toji/swvp/tetens'
+require 'toji/swvp/wagner'
+require 'toji/swvp/sonntag'
+
+module Toji
+  # 飽和水蒸気圧 SWVP: saturation water vapor pressure
+  module Swvp
+    cattr_accessor :default
+    self.default = Wagner.instance
+  end
+end

data/lib/toji/swvp/base.rb

@@ -0,0 +1,8 @@
+require 'singleton'
+
+module Toji
+  module Swvp
+    module Base
+    end
+  end
+end

data/lib/toji/swvp/sonntag.rb

@@ -0,0 +1,23 @@
+require 'toji/swvp/base'
+
+module Toji
+  module Swvp
+
+    # Sonntagの式
+    class Sonntag
+      include Base
+      include Singleton
+  
+      A = -6096.9385
+      B = 21.2409642
+      C = 2.711193 * 10**-2
+      D = 1.673852 * 10**-5
+      E = 2.433502
+  
+      def calc(temp)
+        temp = temp.to_f
+        (Math.exp(A * ((temp + 273.15)**-1) + B - C * (temp + 273.15) + D * ((temp + 273.15)**2) + E * Math.log(temp + 273.15))) / 100 
+      end 
+    end 
+  end
+end

data/lib/toji/swvp/tetens.rb

@@ -0,0 +1,17 @@
+require 'toji/swvp/base'
+
+module Toji
+  module Swvp
+
+    # Tetensの式
+    class Tetens
+      include Base
+      include Singleton
+  
+      def calc(temp)
+        temp = temp.to_f
+        6.11 * 10 ** ((7.5 * temp) / (237.3 + temp))
+      end 
+    end 
+  end
+end

data/lib/toji/swvp/wagner.rb

@@ -0,0 +1,25 @@
+require 'toji/swvp/base'
+
+module Toji
+  module Swvp
+
+    # Wagnerの式
+    class Wagner
+      include Base
+      include Singleton
+  
+      Pc = 221200 # hPa：臨界圧
+      Tc = 647.3  # K：臨界温度
+      A = -7.76451
+      B = 1.45838
+      C = -2.7758
+      D = -1.2303
+  
+      def calc(temp)
+        x = 1 - (temp.to_f + 273.15) / Tc
+        Pc * Math.exp((A * x + B * x**1.5 + C * x**3 + D * x**6) / (1 - x)) 
+      end 
+    end 
+
+  end
+end

data/lib/toji/version.rb

@@ -1,3 +1,3 @@
 module Toji
-  VERSION = "2.26.0"
+  VERSION = "2.27.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toji
 version: !ruby/object:Gem::Version
-  version: 2.26.0
+  version: 2.27.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-07 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -174,6 +174,7 @@ files:
 - lib/toji/progress/state.rb
 - lib/toji/progress/state/baume_to_nihonshudo.rb
 - lib/toji/progress/state/nihonshudo_to_baume.rb
+- lib/toji/psychrometry_to_relative_humidity.rb
 - lib/toji/recipe.rb
 - lib/toji/recipe/ab_expect.rb
 - lib/toji/recipe/action.rb
@@ -184,6 +185,11 @@ files:
 - lib/toji/schedule/kake_schedule.rb
 - lib/toji/schedule/koji_schedule.rb
 - lib/toji/schedule/rice_schedule.rb
+- lib/toji/swvp.rb
+- lib/toji/swvp/base.rb
+- lib/toji/swvp/sonntag.rb
+- lib/toji/swvp/tetens.rb
+- lib/toji/swvp/wagner.rb
 - lib/toji/utils.rb
 - lib/toji/version.rb
 - toji.gemspec