tuscan 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 948c01cc438d0840c2d9f905accded3215c9f606
-  data.tar.gz: c4b2e1ab5c2db49de85d2beb6ca2ff454915e1af
+  metadata.gz: 3728f465a1aabd2f4b350998fa2eedaf9c9ef59c
+  data.tar.gz: d62b8f0be3a3c579dca8b8ca7d8c2200860d5e28
 SHA512:
-  metadata.gz: 6fbc61cc1b7badcd7db81487f069719927d7400cb9b2cc4fc22b4ad49101caa88a2a4ddc5ef6ec945350fa3a4d07c95fdd9d5a6c1f532fbbccda0560e64ac15e
-  data.tar.gz: 1b16e2a96b9ab7237e9fe3280757d64ade3c79a8c315f22af5398cda4f7d921f36584e681ada261eff4bb943ca742eea1a60b5f52a5695707e1562c030118f66
+  metadata.gz: 61a0dc1c6b9e651948ce5f8e68cc3c58f00177e57fd04c0cb8cc5da762f0ef6fc6a8c5c94c2e11cfc8ff50c253eba5a441592278da044c0a26d2d77c03e2bb21
+  data.tar.gz: 69299ceb7829cf0bb2ac30fe5285358901e5ecf7135f568c8e11012d5d54aa92d3fcab513872c7b8410a361372c25cdfe7fd830844e327435391578ac9da0b79

data/README.md

@@ -55,7 +55,7 @@ Tuscan.res(:iec60751, t: 10, r0: 99.876, a:3.9083e-03, b:-5.7750e-07, c:-4.1830e
 **IEC 60584**
 ```ruby
 Tuscan.t90r(:iec60584, emf: 1.234, type: :k)  # emf im mV
-Tuscan.emfir(:iec60584, t: 10.123, type: :k)  # t90 in ºC
+Tuscan.emfr(:iec60584, t: 10.123, type: :k)  # t90 in ºC
 ```
 
 

data/lib/tuscan/iec60584/type_b.rb

@@ -0,0 +1,38 @@
+module Tuscan
+  module Iec60584
+    module TypeB
+      T90_RANGE = 60.0..1820.00
+      EMF_RANGE = 0.290..13.821
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 630.615
+          Polynomial.new(
+            0.000000000000e+00, -0.246508183460e-03,  0.590404211710e-05, -0.132579316360e-08, 
+            0.156682919010e-11, -0.169445292400e-14,  0.629903470940e-18
+          ).solve_for t90
+        else
+          Polynomial.new(
+            -0.389381686210e+01,  0.285717474700e-01, -0.848851047850e-04,  0.157852801640e-06, 
+            -0.168353448640e-09,  0.111097940130e-12, -0.445154310330e-16,  0.989756408210e-20,
+            -0.937913302890e-24 
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 2.431
+          Polynomial.new(
+             9.8423321e+01,  6.9971500e+02, -8.4765304e+02, 1.0052644e+03, -8.3345952e+02,
+             4.5508542e+02, -1.5523037e+02,  2.9886750e+01, -2.4742860e+00
+          ).solve_for emf
+        else
+          Polynomial.new(
+             2.1315071e+02,  2.8510504e+02, -5.2742887e+01,  9.9160804e+00, -1.2965303e+00,
+             1.1195870e-01, -6.0625199e-03,  1.8661696e-04, -2.4878585e-06
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end

data/lib/tuscan/iec60584/type_c.rb

@@ -0,0 +1,17 @@
+module Tuscan
+  module Iec60584
+    module TypeC
+      T90_RANGE = 0.0..2320.0
+      EMF_RANGE = nil
+
+      extend self
+
+      def emfr_unbound t90
+        Polynomial.new(
+          -3.109077870000e-04,  1.338547130000e-02,  1.226236040000e-05, -1.050537530000e-08,
+           3.613274640000e-12, -4.990804550000e-16,  6.434651840000e-22
+        ).solve_for t90
+      end
+    end
+  end
+end

data/lib/tuscan/iec60584/type_e.rb

@@ -0,0 +1,42 @@
+module Tuscan
+  module Iec60584
+    module TypeE
+      T90_RANGE = -270.0..1000.0
+      EMF_RANGE = -8.825..76.373
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 0.0
+          Polynomial.new(
+             0.000000000000e+00,  0.586655087080e-01,  0.454109771240e-04, -0.779980486860e-06,
+            -0.258001608430e-07, -0.594525830570e-09, -0.932140586670e-11, -0.102876055340e-12,
+            -0.803701236210e-15, -0.439794973910e-17, -0.164147763550e-19, -0.396736195160e-22,
+            -0.558273287210e-25, -0.346578420130e-28
+          ).solve_for t90
+        else
+          Polynomial.new(
+             0.000000000000e+00,  0.586655087100e-01,  0.450322755820e-04,  0.289084072120e-07,
+            -0.330568966520e-09,  0.650244032700e-12, -0.191974955040e-15, -0.125366004970e-17,
+             0.214892175690e-20, -0.143880417820e-23,  0.359608994810e-27
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 0.0
+          Polynomial.new(
+             0.0000000e+00,  1.6977288e+01, -4.3514970e-01, -1.5859697e-01, -9.2502871e-02,
+            -2.6084314e-02, -4.1360199e-03, -3.4034030e-04, -1.1564890e-05,  0.0000000e+00
+          ).solve_for emf
+        else
+          Polynomial.new(
+             0.0000000e+00,  1.7057035e+01, -2.3301759e-01,  6.5435585e-03, -7.3562749e-05,
+            -1.7896001e-06,  8.4036165e-08, -1.3735879e-09,  1.0629823e-11, -3.2447087e-14
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end
+

data/lib/tuscan/iec60584/type_j.rb

@@ -0,0 +1,45 @@
+module Tuscan
+  module Iec60584
+    module TypeJ
+      T90_RANGE = -210.0..1200.0
+      EMF_RANGE = -8.096..69.554
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 760.0
+          Polynomial.new(
+             0.000000000000e+00,  0.503811878150e-01,  0.304758369300e-04, -0.856810657200e-07,
+             0.132281952950e-09, -0.170529583370e-12,  0.209480906970e-15, -0.125383953360e-18,
+             0.156317256970e-22
+          ).solve_for t90
+        else
+          Polynomial.new(
+             0.296456256810e+03, -0.149761277860e+01,  0.317871039240e-02, -0.318476867010e-05,
+             0.157208190040e-08, -0.306913690560e-12
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 0.0
+          Polynomial.new(
+             0.0000000e+00,  1.9528268e+01, -1.2286185e+00, -1.0752178e+00, -5.9086933e-01,
+            -1.7256713e-01, -2.8131513e-02, -2.3963370e-03, -8.3823321e-05
+          ).solve_for emf
+        elsif emf < 42.919
+          Polynomial.new(
+             0.000000e+00,   1.978425e+01,  -2.001204e-01,   1.036969e-02,  -2.549687e-04,
+             3.585153e-06,  -5.344285e-08,   5.099890e-10
+          ).solve_for emf
+        else
+          Polynomial.new(
+             -3.11358187e+03, 3.00543684e+02, -9.94773230e+00, 1.70276630e-01, -1.43033468e-03,
+              4.73886084e-06
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end
+

data/lib/tuscan/iec60584/type_k.rb

@@ -0,0 +1,50 @@
+module Tuscan
+  module Iec60584
+    module TypeK
+      T90_RANGE = -270.0..1372.0
+      EMF_RANGE = -5.892..54.887
+
+      include Math
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 0.0
+          Polynomial.new(
+             0.000000000000e+00,  0.394501280250e-01,  0.236223735980e-04, -0.328589067840e-06,
+            -0.499048287770e-08, -0.675090591730e-10, -0.574103274280e-12, -0.310888728940e-14,
+            -0.104516093650e-16, -0.198892668780e-19, -0.163226974860e-22
+          ).solve_for t90
+        else
+          Polynomial.new(
+            -0.176004136860e-01,  0.389212049750e-01,  0.185587700320e-04, -0.994575928740e-07,
+             0.318409457190e-09, -0.560728448890e-12,  0.560750590590e-15, -0.320207200030e-18, 
+             0.971511471520e-22, -0.121047212750e-25 
+          ).solve_for(t90) +
+          0.1185976e+00 * exp(-0.1183432e-03 * (t90 - 0.1269686e+03)**2)
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 0.0
+          Polynomial.new(
+             0.0000000e+00,  2.5173462e+01, -1.1662878e+00, -1.0833638e+00, -8.9773540e-01, 
+            -3.7342377e-01, -8.6632643e-02, -1.0450598e-02, -5.1920577e-04
+          ).solve_for emf
+        elsif emf < 20.644
+          Polynomial.new(
+             0.000000e+00,   2.508355e+01,   7.860106e-02,  -2.503131e-01,   8.315270e-02,
+            -1.228034e-02,   9.804036e-04,  -4.413030e-05,
+             1.057734e-06,  -1.052755e-08
+          ).solve_for emf
+        else
+          Polynomial.new(
+            -1.318058e+02,   4.830222e+01,  -1.646031e+00,   5.464731e-02,  -9.650715e-04,
+             8.802193e-06,  -3.110810e-08
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end
+

data/lib/tuscan/iec60584/type_n.rb

@@ -0,0 +1,46 @@
+module Tuscan
+  module Iec60584
+    module TypeN
+      T90_RANGE = -270.0..1300.0
+      EMF_RANGE = -3.991..47.513
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 0.0
+          Polynomial.new(
+             0.000000000000e+00,  0.261591059620e-01,  0.109574842280e-04, -0.938411115540e-07,
+            -0.464120397590e-10, -0.263033577160e-11, -0.226534380030e-13, -0.760893007910e-16,
+            -0.934196678350e-19
+          ).solve_for t90
+        else
+          Polynomial.new(
+             0.000000000000e+00,  0.259293946010e-01,  0.157101418800e-04,  0.438256272370e-07,
+            -0.252611697940e-09,  0.643118193390e-12, -0.100634715190e-14,  0.997453389920e-18,
+            -0.608632456070e-21,  0.208492293390e-24, -0.306821961510e-28
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 0.0
+          Polynomial.new(
+             0.0000000e+00,  3.8436847e+01,  1.1010485e+00,  5.2229312e+00,  7.2060525e+00,
+             5.8488586e+00,  2.7754916e+00,  7.7075166e-01,  1.1582665e-01,  7.3138868e-03
+          ).solve_for emf
+        elsif emf < 20.613
+          Polynomial.new(
+             0.00000e+00,    3.86896e+01,   -1.08267e+00,    4.70205e-02,   -2.12169e-06,
+            -1.17272e-04,    5.39280e-06,   -7.98156e-08
+          ).solve_for emf
+        else
+          Polynomial.new(
+             1.972485e+01,   3.300943e+01,  -3.915159e-01,   9.855391e-03,  -1.274371e-04,
+             7.767022e-07
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end
+

data/lib/tuscan/iec60584/type_r.rb

@@ -0,0 +1,55 @@
+module Tuscan
+  module Iec60584
+    module TypeR
+      T90_RANGE = -50.00..1768.10
+      EMF_RANGE = -0.227..21.103 
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 1064.18
+          Polynomial.new(
+             0.000000000000e+00,  0.528961729765e-02,  0.139166589782e-04, -0.238855693017e-07,
+             0.356916001063e-10, -0.462347666298e-13 , 0.500777441034e-16, -0.373105886191e-19,
+             0.157716482367e-22, -0.281038625251e-26
+          ).solve_for t90
+        elsif t90 < 1664.50
+          Polynomial.new(
+             0.295157925316e+01, -0.252061251332e-02,  0.159564501865e-04, -0.764085947576e-08,
+             0.205305291024e-11, -0.293359668173e-15
+          ).solve_for t90
+        else
+          Polynomial.new(
+             0.152232118209e+03, -0.268819888545e+00,  0.171280280471e-03, -0.345895706453e-07,
+            -0.934633971046e-14 
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 1.923
+          Polynomial.new(
+             0.0000000e+00,  1.8891380e+02, -9.3835290e+01,  1.3068619e+02, -2.2703580e+02,
+             3.5145659e+02, -3.8953900e+02,  2.8239471e+02, -1.2607281e+02,  3.1353611e+01,
+            -3.3187769e+00
+          ).solve_for emf
+        elsif emf < 13.228
+          Polynomial.new(
+             1.334584505e+01,  1.472644573e+02, -1.844024844e+01,  4.031129726e+00, -6.249428360e-01,
+             6.468412046e-02, -4.458750426e-03,  1.994710149e-04, -5.313401790e-06,  6.481976217e-08
+          ).solve_for emf
+        elsif emf < 19.739
+          Polynomial.new(
+            -8.199599416e+01,  1.553962042e+02, -8.342197663e+00,  4.279433549e-01, -1.191577910e-02,
+             1.492290091e-04
+          ).solve_for emf
+        else
+          Polynomial.new(
+             3.406177836e+04, -7.023729171e+03,  5.582903813e+02, -1.952394635e+01,  2.560740231e-01
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end
+

data/lib/tuscan/iec60584/type_s.rb

@@ -0,0 +1,54 @@
+module Tuscan
+  module Iec60584
+    module TypeS
+      T90_RANGE = -50.00..1768.10
+      EMF_RANGE = -0.236..18.693
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 1064.18
+          Polynomial.new(
+             0.000000000000e+00,  0.540313308631e-02,  0.125934289740e-04, -0.232477968689e-07,
+             0.322028823036e-10, -0.331465196389e-13,  0.255744251786e-16, -0.125068871393e-19,
+             0.271443176145e-23
+          ).solve_for t90
+        elsif t90 < 1664.50
+          Polynomial.new(
+             0.132900444085e+01,  0.334509311344e-02,  0.654805192818e-05, -0.164856259209e-08,
+             0.129989605174e-13
+          ).solve_for t90
+        else
+          Polynomial.new(
+             0.146628232636e+03, -0.258430516752e+00,  0.163693574641e-03, -0.330439046987e-07,
+            -0.943223690612e-14
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 1.874
+          Polynomial.new(
+             0.00000000e+00,  1.84949460e+02, -8.00504062e+01,  1.02237430e+02, -1.52248592e+02,
+             1.88821343e+02, -1.59085941e+02,  8.23027880e+01, -2.34181944e+01,  2.79786260e+00
+          ).solve_for emf
+        elsif emf < 11.950
+          Polynomial.new(
+             1.291507177e+01,  1.466298863e+02, -1.534713402e+01,  3.145945973e+00, -4.163257839e-01,
+             3.187963771e-02, -1.291637500e-03,  2.183475087e-05, -1.447379511e-07,  8.211272125e-09
+          ).solve_for emf
+        elsif emf < 17.536
+          Polynomial.new(
+            -8.087801117e+01,  1.621573104e+02, -8.536869453e+00,  4.719686976e-01, -1.441693666e-02,
+             2.081618890e-04
+          ).solve_for emf
+        else
+          Polynomial.new(
+             5.333875126e+04, -1.235892298e+04,  1.092657613e+03, -4.265693686e+01,  6.247205420e-01
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end
+

data/lib/tuscan/iec60584/type_t.rb

@@ -0,0 +1,41 @@
+module Tuscan
+  module Iec60584
+    module TypeT
+      T90_RANGE = -270.0..400.0 
+      EMF_RANGE = -5.603..20.872 
+
+      extend self
+
+      def emfr_unbound t90
+        if t90 < 0.0
+          Polynomial.new(
+             0.000000000000e+00,  0.387481063640e-01,  0.441944343470e-04,  0.118443231050e-06,
+             0.200329735540e-07,  0.901380195590e-09,  0.226511565930e-10,  0.360711542050e-12,
+             0.384939398830e-14,  0.282135219250e-16,  0.142515947790e-18,  0.487686622860e-21,
+             0.107955392700e-23,  0.139450270620e-26,  0.797951539270e-30
+          ).solve_for t90
+        else
+          Polynomial.new(
+             0.000000000000e+00,  0.387481063640e-01,  0.332922278800e-04,  0.206182434040e-06,
+            -0.218822568460e-08,  0.109968809280e-10, -0.308157587720e-13,  0.454791352900e-16,
+            -0.275129016730e-19
+          ).solve_for t90
+        end
+      end
+
+      def t90r_guess emf
+        if emf < 0.0
+          Polynomial.new(
+             0.0000000e+00,  2.5949192e+01, -2.1316967e-01,  7.9018692e-01,  4.2527777e-01, 
+             1.3304473e-01,  2.0241446e-02,  1.2668171e-03
+          ).solve_for emf
+        else
+          Polynomial.new(
+             0.000000e+00,   2.592800e+01,  -7.602961e-01,   4.637791e-02,  -2.165394e-03,
+             6.048144e-05,  -7.293422e-07
+          ).solve_for emf
+        end
+      end
+    end
+  end
+end

data/lib/tuscan/iec60584.rb

@@ -1,391 +1,46 @@
+require 'byebug'
+
 module Tuscan
   module Iec60584
-    include Math
     extend self
 
+    def t90 emf, type:, a: 0.0, b: 0.0, c: 0.0, d: 0.0, err: 1e-3, num: 10
+      emfc = emf - emfdev(t90r(emf, type, err, num), a, b, c, d)
+      t90r emfc, type, err, num
+    end
+    alias_method :t, :t90
+    alias_method :temperature, :t90
 
-    def emfr t90, type, range_check = true
-      a = emf_a_coeffs t90, type
-      result  = emf_c_coeffs(t90, type).each_with_index.map{ |c,i| c*t90**i }.reduce(:+)
-      result += a[0] * exp(a[1] * (t90 - a[2])**2)
+    def emfr t90, type
+      raise RangeError, 't90 is outside the valid range' if out_of_range? t90, type
+      emfr_unbound t90, type
     end
 
-    def t90r emf, type, err: 1e-3, num: 100
+    def t90r emf, type, err, num
       guess = t90r_guess emf, type
-      Rical.inverse_for f: method(:emfr), fargs: type,
-                        x0: guess - 0.5, x1: guess + 0.5,
-                        y: emf, method: :secant,
-                        num: num, err: err * 1e-3
+      Rical.inverse_for f: method(:emfr_unbound), fargs: type, x0: guess - 0.5, x1: guess + 0.5,
+                        y: emf, method: :secant, num: num, err: err * 1e-3
     end
 
+    def emfdev t90, a, b, c, d
+      Polynomial.new(a, b, c, d).solve_for t90
+    end
 
   private
     def t90r_guess emf, type
-      t90_coeffs(emf, type).each_with_index.map{ |d,i| d*emf**i }.reduce(:+)
-    end
-
-    def emf_c_coeffs t90, type
-      case type
-      when :b then emf_c_coeffs_b t90
-      when :c then emf_c_coeffs_c t90
-      when :e then emf_c_coeffs_e t90
-      when :j then emf_c_coeffs_j t90
-      when :k then emf_c_coeffs_k t90
-      when :n then emf_c_coeffs_n t90
-      when :r then emf_c_coeffs_r t90
-      when :s then emf_c_coeffs_s t90
-      when :t then emf_c_coeffs_t t90
-      end
-    end
-
-    def emf_c_coeffs_b t90
-      #   0.000..630.615
-      # 630.615..1820.00
-      if t90 < 630.615
-        [  0.000000000000e+00, -0.246508183460e-03,  0.590404211710e-05,
-          -0.132579316360e-08,  0.156682919010e-11, -0.169445292400e-14,
-           0.629903470940e-18                                           ]
-      else
-        [ -0.389381686210e+01,  0.285717474700e-01, -0.848851047850e-04,
-           0.157852801640e-06, -0.168353448640e-09,  0.111097940130e-12,
-          -0.445154310330e-16,  0.989756408210e-20, -0.937913302890e-24 ]
-      end
-    end
-
-    def emf_c_coeffs_c t90
-      # 0.0..2320.0
-      [ -3.109077870000e-04,  1.338547130000e-02,  1.226236040000e-05,
-        -1.050537530000e-08,  3.613274640000e-12, -4.990804550000e-16,
-         6.434651840000e-22                                           ]
-    end
-
-    def emf_c_coeffs_e t90
-      # -270.0..0.0
-      #    0.0..1000.0
-      if t90 < 0.0
-        [  0.000000000000e+00,  0.586655087080e-01,  0.454109771240e-04,
-          -0.779980486860e-06, -0.258001608430e-07, -0.594525830570e-09,
-          -0.932140586670e-11, -0.102876055340e-12, -0.803701236210e-15,
-          -0.439794973910e-17, -0.164147763550e-19, -0.396736195160e-22,
-          -0.558273287210e-25, -0.346578420130e-28                      ]
-      else
-        [  0.000000000000e+00,  0.586655087100e-01,  0.450322755820e-04,
-           0.289084072120e-07, -0.330568966520e-09,  0.650244032700e-12,
-          -0.191974955040e-15, -0.125366004970e-17,  0.214892175690e-20,
-          -0.143880417820e-23,  0.359608994810e-27                      ]
-      end
-    end
-
-    def emf_c_coeffs_j t90
-      # -210.0..760.0
-      #  760.0..1200.0
-      if t90 < 760.0
-        [  0.000000000000e+00,  0.503811878150e-01,  0.304758369300e-04,
-          -0.856810657200e-07,  0.132281952950e-09, -0.170529583370e-12,
-           0.209480906970e-15, -0.125383953360e-18,  0.156317256970e-22 ]
-      else
-        [  0.296456256810e+03, -0.149761277860e+01,  0.317871039240e-02,
-          -0.318476867010e-05,  0.157208190040e-08, -0.306913690560e-12 ]
-      end
-    end
-
-    def emf_c_coeffs_k t90
-      # -270.0..0.0
-      #    0.0..1372.0
-      if t90 < 0.0
-        [  0.000000000000e+00,  0.394501280250e-01,  0.236223735980e-04,
-          -0.328589067840e-06, -0.499048287770e-08, -0.675090591730e-10,
-          -0.574103274280e-12, -0.310888728940e-14, -0.104516093650e-16,
-          -0.198892668780e-19, -0.163226974860e-22                      ]
-      else
-        [ -0.176004136860e-01,  0.389212049750e-01,  0.185587700320e-04,
-          -0.994575928740e-07,  0.318409457190e-09, -0.560728448890e-12,
-           0.560750590590e-15, -0.320207200030e-18,  0.971511471520e-22,
-          -0.121047212750e-25                                           ]
-      end
-    end
-
-    def emf_c_coeffs_n t90
-      # -270.0..0.0
-      #    0.0..1300.0
-      if t90 < 0.0
-        [  0.000000000000e+00,  0.261591059620e-01,  0.109574842280e-04,
-          -0.938411115540e-07, -0.464120397590e-10, -0.263033577160e-11,
-          -0.226534380030e-13, -0.760893007910e-16, -0.934196678350e-19 ]
-      else
-        [  0.000000000000e+00,  0.259293946010e-01,  0.157101418800e-04,
-           0.438256272370e-07, -0.252611697940e-09,  0.643118193390e-12,
-          -0.100634715190e-14,  0.997453389920e-18, -0.608632456070e-21,
-           0.208492293390e-24, -0.306821961510e-28                      ]
-      end
-    end
-
-    def emf_c_coeffs_r t90
-      #  -50.00..1064.18
-      # 1064.18..1664.50
-      # 1664.50..1768.10
-      if t90 < 1064.18
-        [  0.000000000000e+00,  0.528961729765e-02,  0.139166589782e-04,
-          -0.238855693017e-07,  0.356916001063e-10, -0.462347666298e-13,
-           0.500777441034e-16, -0.373105886191e-19,  0.157716482367e-22,
-          -0.281038625251e-26                                           ]
-      elsif t90 < 1664.50
-        [  0.295157925316e+01, -0.252061251332e-02,  0.159564501865e-04,
-          -0.764085947576e-08,  0.205305291024e-11, -0.293359668173e-15 ]
-      else
-        [  0.152232118209e+03, -0.268819888545e+00,  0.171280280471e-03,
-          -0.345895706453e-07, -0.934633971046e-14                      ]
-      end
-    end
-
-    def emf_c_coeffs_s t90
-      #  -50.00..1064.18
-      # 1064.18..1664.50
-      # 1664.50..1768.10
-      if t90 < 1064.18
-        [  0.000000000000e+00,  0.540313308631e-02,  0.125934289740e-04,
-          -0.232477968689e-07,  0.322028823036e-10, -0.331465196389e-13,
-           0.255744251786e-16, -0.125068871393e-19,  0.271443176145e-23 ]
-      elsif t90 < 1664.50
-        [  0.132900444085e+01,  0.334509311344e-02,  0.654805192818e-05,
-          -0.164856259209e-08,  0.129989605174e-13                      ]
-      else
-        [  0.146628232636e+03, -0.258430516752e+00,  0.163693574641e-03,
-          -0.330439046987e-07, -0.943223690612e-14                      ]
-      end
-    end
-
-    def emf_c_coeffs_t t90
-      # -270.0..0.0
-      #    0.0..400.0
-      if t90 < 0.0
-        [  0.000000000000e+00,  0.387481063640e-01,  0.441944343470e-04,
-           0.118443231050e-06,  0.200329735540e-07,  0.901380195590e-09,
-           0.226511565930e-10,  0.360711542050e-12,  0.384939398830e-14,
-           0.282135219250e-16,  0.142515947790e-18,  0.487686622860e-21,
-           0.107955392700e-23,  0.139450270620e-26,  0.797951539270e-30 ]
-      else
-        [  0.000000000000e+00,  0.387481063640e-01,  0.332922278800e-04,
-           0.206182434040e-06, -0.218822568460e-08,  0.109968809280e-10,
-          -0.308157587720e-13,  0.454791352900e-16, -0.275129016730e-19 ]
-      end
-    end
-
-    def emf_a_coeffs t90, type
-      case type
-      when :b then emf_a_coeffs_b t90
-      when :c then emf_a_coeffs_c t90
-      when :e then emf_a_coeffs_e t90
-      when :j then emf_a_coeffs_j t90
-      when :k then emf_a_coeffs_k t90
-      when :n then emf_a_coeffs_n t90
-      when :r then emf_a_coeffs_r t90
-      when :s then emf_a_coeffs_s t90
-      when :t then emf_a_coeffs_t t90
-      end
-    end
-
-    def emf_a_coeffs_b t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_c t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_e t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_j t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_k t90
-      if t90 < 0.0
-        [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-      else
-        [ 0.1185976e+00, -0.1183432e-03,  0.1269686e+03 ]
-      end
-    end
-
-    def emf_a_coeffs_n t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_r t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_s t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-    def emf_a_coeffs_t t90
-      [ 0.0000000e+00,  0.0000000e+00,  0.0000000e+00 ]
-    end
-
-
-    def t90_coeffs emf, type
-      case type
-      when :b then t90_coeffs_b emf
-      when :e then t90_coeffs_e emf
-      when :j then t90_coeffs_j emf
-      when :k then t90_coeffs_k emf
-      when :n then t90_coeffs_n emf
-      when :r then t90_coeffs_r emf
-      when :s then t90_coeffs_s emf
-      when :t then t90_coeffs_t emf
-      end
-    end
-
-    def t90_coeffs_b emf
-      # 0.290..2.431
-      # 2.431..13.821
-      if emf < 2.431
-        [  9.8423321e+01,  6.9971500e+02, -8.4765304e+02,
-           1.0052644e+03, -8.3345952e+02,  4.5508542e+02,
-          -1.5523037e+02,  2.9886750e+01, -2.4742860e+00 ]
-      else
-        [  2.1315071e+02,  2.8510504e+02, -5.2742887e+01,
-           9.9160804e+00, -1.2965303e+00,  1.1195870e-01,
-          -6.0625199e-03,  1.8661696e-04, -2.4878585e-06 ]
-      end
-    end
-
-    def t90_coeffs_e emf
-      # -8.825..0.000
-      #  0.000..76.373
-      if emf < 0.0
-        [  0.0000000e+00,  1.6977288e+01, -4.3514970e-01,
-          -1.5859697e-01, -9.2502871e-02, -2.6084314e-02,
-          -4.1360199e-03, -3.4034030e-04, -1.1564890e-05,
-           0.0000000e+00                                 ]
-      else
-        [  0.0000000e+00,  1.7057035e+01, -2.3301759e-01,
-           6.5435585e-03, -7.3562749e-05, -1.7896001e-06,
-           8.4036165e-08, -1.3735879e-09,  1.0629823e-11,
-          -3.2447087e-14                                 ]
-      end
-    end
-
-    def t90_coeffs_j emf
-      # -8.096..0.000
-      #  0.000..42.919
-      # 42.919..69.554
-      if emf < 0.0
-        [  0.0000000e+00,   1.9528268e+01,  -1.2286185e+00,
-          -1.0752178e+00,  -5.9086933e-01,  -1.7256713e-01,
-          -2.8131513e-02,  -2.3963370e-03,  -8.3823321e-05  ]
-      elsif emf < 42.919
-        [  0.000000e+00,    1.978425e+01,   -2.001204e-01,
-           1.036969e-02,   -2.549687e-04,    3.585153e-06,
-          -5.344285e-08,    5.099890e-10                    ]
-      else
-        [ -3.11358187e+03,  3.00543684e+02, -9.94773230e+00,
-           1.70276630e-01, -1.43033468e-03,  4.73886084e-06 ]
-      end
-    end
-
-    def t90_coeffs_k emf
-      # -5.892..0.000
-      #  0.000..20.644
-      # 20.644..54.887
-      if emf < 0.0
-        [  0.0000000e+00,  2.5173462e+01, -1.1662878e+00,
-          -1.0833638e+00, -8.9773540e-01, -3.7342377e-01,
-          -8.6632643e-02, -1.0450598e-02, -5.1920577e-04  ]
-      elsif emf < 20.644
-        [  0.000000e+00,   2.508355e+01,   7.860106e-02,
-          -2.503131e-01,   8.315270e-02,  -1.228034e-02,
-           9.804036e-04,  -4.413030e-05,   1.057734e-06,
-          -1.052755e-08                                   ]
-      else
-        [ -1.318058e+02,   4.830222e+01,  -1.646031e+00,
-           5.464731e-02,  -9.650715e-04,   8.802193e-06,
-          -3.110810e-08                                   ]
-      end
-    end
-
-    def t90_coeffs_n emf
-      # -3.991..0.000
-      #  0.000..20.613
-      # 20.613..47.513
-      if emf < 0.0
-        [  0.0000000e+00,  3.8436847e+01,  1.1010485e+00,
-           5.2229312e+00,  7.2060525e+00,  5.8488586e+00,
-           2.7754916e+00,  7.7075166e-01,  1.1582665e-01,
-           7.3138868e-03                                  ]
-      elsif emf < 20.613
-        [  0.00000e+00,    3.86896e+01,   -1.08267e+00,
-           4.70205e-02,   -2.12169e-06,   -1.17272e-04,
-           5.39280e-06,   -7.98156e-08                    ]
-      else
-        [  1.972485e+01,   3.300943e+01,  -3.915159e-01,
-           9.855391e-03,  -1.274371e-04,   7.767022e-07   ]
-      end
+      tc(type).t90r_guess emf
     end
 
-    def t90_coeffs_r emf
-      # -0.227..1.923
-      #  1.923..13.228
-      # 11.361..19.739
-      # 19.739..21.103
-      if emf < 1.923
-        [  0.0000000E+00,    1.8891380E+02,   -9.3835290E+01,
-           1.3068619E+02,   -2.2703580E+02,    3.5145659E+02,
-          -3.8953900E+02,    2.8239471E+02,   -1.2607281E+02,
-           3.1353611E+01,   -3.3187769E+00                     ]
-      elsif emf < 13.228
-        [  1.334584505E+01,  1.472644573E+02, -1.844024844E+01,
-           4.031129726E+00, -6.249428360E-01,  6.468412046E-02,
-          -4.458750426E-03,  1.994710149E-04, -5.313401790E-06,
-           6.481976217E-08                                     ]
-      elsif emf < 19.739
-        [ -8.199599416E+01,  1.553962042E+02, -8.342197663E+00,
-           4.279433549E-01, -1.191577910E-02,  1.492290091E-04 ]
-      else
-        [  3.406177836E+04, -7.023729171E+03,  5.582903813E+02,
-          -1.952394635E+01,  2.560740231E-01                   ]
-      end
+    def emfr_unbound t90, type
+      tc(type).emfr_unbound t90
     end
 
-    def t90_coeffs_s emf
-      # -0.236..1.874
-      #  1.874..11.950
-      # 10.332..17.536
-      # 17.536..18.693
-      if emf < 1.874
-        [  0.00000000E+00,   1.84949460E+02,  -8.00504062E+01,
-           1.02237430E+02,  -1.52248592E+02,   1.88821343E+02,
-          -1.59085941E+02,   8.23027880E+01,  -2.34181944E+01,
-           2.79786260E+00                                      ]
-      elsif emf < 11.950
-        [  1.291507177E+01,  1.466298863E+02, -1.534713402E+01,
-           3.145945973E+00, -4.163257839E-01,  3.187963771E-02,
-          -1.291637500E-03,  2.183475087E-05, -1.447379511E-07,
-           8.211272125E-09                                     ]
-      elsif emf < 17.536
-        [ -8.087801117E+01,  1.621573104E+02, -8.536869453E+00,
-           4.719686976E-01, -1.441693666E-02,  2.081618890E-04 ]
-      else
-        [  5.333875126E+04, -1.235892298E+04,  1.092657613E+03,
-          -4.265693686E+01,  6.247205420E-01                   ]
-      end
+    def out_of_range? t90, type
+      !tc(type)::T90_RANGE.include? t90
     end
 
-    def t90_coeffs_t emf
-      # -5.603..0.000
-      #  0.000..20.872
-      if emf < 0.0
-        [  0.0000000E+00,  2.5949192E+01, -2.1316967E-01,
-           7.9018692E-01,  4.2527777E-01,  1.3304473E-01,
-           2.0241446E-02,  1.2668171E-03                 ]
-      else
-        [  0.000000E+00,   2.592800E+01,  -7.602961E-01,
-           4.637791E-02,  -2.165394E-03,   6.048144E-05,
-          -7.293422E-07                                  ]
-      end
+    def tc type
+      self.const_get "Type#{type.upcase}"
     end
   end
 end

data/lib/tuscan/iec60751.rb

@@ -7,38 +7,43 @@ module Tuscan
     B  =  -5.7750e-07
     C  =  -4.1830e-12
 
+    R_RANGE   = 18.5201..390.4811
+    T90_RANGE = -200.000..850.000
+
     extend self
 
     def r t90, r0: R0, a: A, b: B, c: C
-      t90 >= 0 ?
-        r0*(1 + a*t90 + b*t90**2) :
-        r0*(1 + a*t90 + b*t90**2 - 100*c*t90**3 + c*t90**4)
+      raise RangeError, 't90 is outside the valid range' unless T90_RANGE.include? t90
+      r_unbound t90, r0, a, b, c
     end
     alias_method :res, :r
     alias_method :resistance, :r
 
     def t90 r, r0: R0, a: A, b: B, c: C, num: 10, err: 1e-4
+      raise RangeError, 'r is outside the valid range' unless R_RANGE.include? r
       if r >= r0
         (-a + (a**2 - 4 * b * (1 - r / r0))**(0.5)) / (2 * b)
       else
-        args = { r0: r0, a: a, b: b, c: c }
-        Rical.inverse_for f: method(:r),   fargs: args,
-                              df: method(:dr), dfargs: args,
-                              x0: t90_guess(r, args), y: r,
-                              method: :n, num: num, err: err
-      end.to_f
-    rescue RangeError
-      Float::NAN
+        args = [r0, a, b, c]
+        Rical.inverse_for f: method(:r_unbound), fargs: args, df: method(:dr), dfargs: args,
+                          x0: t90_guess(r, *args), y: r, method: :newton, num: num, err: err
+      end
     end
     alias_method :t, :t90
     alias_method :temperature, :t90
 
   private
-    def t90_guess r, r0:, a:, b:, c:
+    def r_unbound t90, r0, a, b, c
+      t90 >= 0 ?
+        r0*(1 + a*t90 + b*t90**2) :
+        r0*(1 + a*t90 + b*t90**2 - 100*c*t90**3 + c*t90**4)
+    end
+
+    def t90_guess r, r0, a, b, c
       ((r / r0) - 1) / (a + 100 * b)                  # valid for r < r0
     end
 
-    def dr t90, r0:, a:, b:, c:
+    def dr t90, r0, a, b, c
       r0 * (a + 2*b*t90 - 300*c*t90**2 + 4*c*t90**3)  # valid for t90 < 0
     end
   end

data/lib/tuscan/its90.rb

@@ -28,7 +28,7 @@ module Tuscan
 
     def t90 r, rtpw:, **args
       w = r / rtpw
-      Its90.t90r w - wdev(Its90.t90r(w), args)
+      t90r w - wdev(t90r(w), args)
     end
     alias_method :t, :t90
     alias_method :temperature, :t90
@@ -87,7 +87,7 @@ module Tuscan
                   c1: 0.0, c2: 0.0, c3: 0.0, c4: 0.0, c5: 0.0
       equation = WDEV_EQUATIONS[subrange - 1]
       # return nil unless equation[:valid].include? t90
-      wr_t90 = Its90.wr t90
+      wr_t90 = wr t90
       case subrange
       when 1..4
         wdev  = a * (wr_t90 - 1)

data/lib/tuscan/polynomial.rb

@@ -0,0 +1,11 @@
+module Tuscan
+  class Polynomial
+    def initialize *coeffs
+      @coeffs = coeffs
+    end
+
+    def solve_for x
+      @coeffs.each_with_index.map{ |c,i| c*x**i }.reduce(:+)
+    end
+  end
+end

data/lib/tuscan/version.rb

@@ -1,3 +1,3 @@
 module Tuscan
-  VERSION = '0.0.3'
+  VERSION = '0.0.6'
 end

data/lib/tuscan.rb

@@ -1,7 +1,17 @@
 require 'tuscan/version'
+require 'tuscan/polynomial'
 require 'tuscan/its90'
 require 'tuscan/iec60751'
 require 'tuscan/iec60584'
+require 'tuscan/iec60584/type_b'
+require 'tuscan/iec60584/type_c'
+require 'tuscan/iec60584/type_e'
+require 'tuscan/iec60584/type_j'
+require 'tuscan/iec60584/type_k'
+require 'tuscan/iec60584/type_n'
+require 'tuscan/iec60584/type_r'
+require 'tuscan/iec60584/type_s'
+require 'tuscan/iec60584/type_t'
 
 module Tuscan
   extend self

data/spec/tuscan/iec60584_spec.rb

@@ -2,15 +2,17 @@ require 'spec_helper'
 
 #
 # TODO:
-#   1. implement deviation function (polynomial)
-#   2. check B, 0 mV t90 computation (errorin inverse coeffs?)
+#   1. implement emf(t90, ...) as an inverse of t90(emf, ...)
+#   2. compute better t90_guess for 50..250 ºC to allow extension of T90_RANGE down to 50ºC
 #
 module Tuscan
   describe Iec60584 do
     context 'reference functions' do
+      err = 1e-3
+      num = 10
       examples = {
         b: [
-          # { emf:  0.000000, t90:   0.0 },
+          { emf:  0.006197, t90:  60.0 },
           { emf:  0.291279, t90: 250.0 },
           { emf:  1.974546, t90: 630.0 },
           { emf:  1.980771, t90: 631.0 },
@@ -104,12 +106,57 @@ module Tuscan
           context "on a type #{type.upcase} thermocouple" do
             examples[type].each do |example|
               it "yields #{example[:t90]} ºC when emf equals #{example[:emf]} mV" do
-                expect(Iec60584.t90r(example[:emf], type)).to be_within(1e-3).of(example[:t90])
+                expect(Iec60584.t90r(example[:emf], type, err, num)).to be_within(1e-3).of(example[:t90])
               end
             end
           end
         end
       end
+
+      context 'deviation functions' do
+        context 'emfdev computation' do
+          it 'delegates to Polynomial' do
+            expect(Polynomial).to receive(:new).with(1, 2, 3, 4).and_call_original
+            Iec60584.emfdev 0, 1, 2, 3, 4
+          end
+
+          it 'calls Polynomial#solve_for' do
+            expect_any_instance_of(Polynomial).to receive(:solve_for).with(0)
+            Iec60584.emfdev 0, 1, 2, 3, 4
+          end
+        end
+      end
+
+      context 'range validation' do
+        %i{ b c e j k n r s t }.each do |type|
+          context "on a type #{type.upcase} thermocouple" do
+            t90lo = examples[type].first[:t90] - 1.0
+            it "raises RangeError when t90 is #{t90lo} ºC" do
+              expect{ Iec60584.emfr t90lo, type }.to raise_error RangeError
+            end
+
+            t90hi = examples[type].last[:t90] + 1.0
+            it "raises RangeError when t90 is #{t90hi} ºC" do
+              expect{ Iec60584.emfr t90hi, type }.to raise_error RangeError
+            end
+          end
+        end
+      end
+
+      context 't90 function' do
+        tc = { type: :r, a: 0, b: -1.39363e-05, c: 3.75578e-08, d: -2.17624e-11 }
+        examples = [
+          { emf:  3.6105, t90:  419.527 },
+          { emf: 10.0054, t90:  961.78  },
+          { emf: 11.6417, t90: 1084.62  }
+        ]
+
+        examples.each do |example|
+          it "complies with NPL cert. 2014040275/1/PM03, #{example[:emf]} mV => #{example[:t90]} ºC" do
+            expect(Iec60584.t90 example[:emf], tc).to be_within(0.01).of(example[:t90])
+          end
+        end
+      end
     end
   end
 end

data/spec/tuscan/iec60751_spec.rb

@@ -22,13 +22,14 @@ module Tuscan
           expect(Iec60751.r 0, r0: 101.0).to be_within(1e-4).of(101)
         end
       end
-    end
 
-    context 'temperature computation' do
-      it 'yields complex temperatures as NaN' do
-        expect(Iec60751.t90 1000).to be Float::NAN
+      it 'raises RangeError when t90 is out of range' do
+        expect{ Iec60751.r -201.0 }.to raise_error RangeError
+        expect{ Iec60751.r  851.0 }.to raise_error RangeError
       end
+    end
 
+    context 'temperature computation' do
       context 'standard coefficients' do
         examples.each do |example|
           it "yields #{example[:t90]} Celius when resistance equals #{example[:r]} Ohm" do
@@ -42,6 +43,11 @@ module Tuscan
           expect(Iec60751.t90 101, r0: 101.0).to be_within(1e-4).of(0)
         end
       end
+
+      it 'raises RangeError when r is out of range' do
+        expect{ Iec60751.t90  18.0 }.to raise_error RangeError
+        expect{ Iec60751.t90 391.0 }.to raise_error RangeError
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tuscan
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Luis Bacelar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rical
@@ -83,8 +83,18 @@ files:
 - Rakefile
 - lib/tuscan.rb
 - lib/tuscan/iec60584.rb
+- lib/tuscan/iec60584/type_b.rb
+- lib/tuscan/iec60584/type_c.rb
+- lib/tuscan/iec60584/type_e.rb
+- lib/tuscan/iec60584/type_j.rb
+- lib/tuscan/iec60584/type_k.rb
+- lib/tuscan/iec60584/type_n.rb
+- lib/tuscan/iec60584/type_r.rb
+- lib/tuscan/iec60584/type_s.rb
+- lib/tuscan/iec60584/type_t.rb
 - lib/tuscan/iec60751.rb
 - lib/tuscan/its90.rb
+- lib/tuscan/polynomial.rb
 - lib/tuscan/version.rb
 - spec/spec_helper.rb
 - spec/tuscan/iec60584_spec.rb