tuscan 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2543badcdb3312b2f5b8137766cddc323887e10f
-  data.tar.gz: 5dc2685148190c63c30277e384fc5b272631bd91
+  metadata.gz: ad738c50ed39a35ff52fcef068d2b6aa9b59a549
+  data.tar.gz: 05d787b303178093ae55ce8fe0e92622f9faa79c
 SHA512:
-  metadata.gz: 3d3dd9a95da487edd7a192cc273df640d9599ef068ec26ad7214e6c0abfb6369a96815cc196f736dbc07343db35d6fb10e68c78bf84930ed865fb75198701665
-  data.tar.gz: 159021a9b23eaa493f9462fde5b363819181364840a878a77f66fb2b8d92ca93d05ad3271545efdfea30a4519b80c642ef3226ce77bd45615593da49d09f0062
+  metadata.gz: 0eed9648923f011a331c3652b08f3e634d99c4ebcde32c13a535121d27f1fc43389f942aa4ea85220c5836ace14404a7d82d6e963f05a3b97f6e6c2e01bdcc8b
+  data.tar.gz: de21fa4fd6d4af6822410735b6840f2ded1dce8a2b8e1e4f07a9158ca71888d3ee7ee76e54772d07159fbf76cb99d4a1bcd9f200db4c84ee02556a817149a364

data/lib/tuscan/iec60584.rb

@@ -10,12 +10,20 @@ module Tuscan
       result += a[0] * exp(a[1] * (t90 - a[2])**2)
     end
 
-    def t90r emf, type, err_limit: 0.1, num_iter: 1000
-      t90_coeffs(emf, type).each_with_index.map{ |d,i| d*emf**i }.reduce(:+)
+    def t90r emf, type, err: 1e-3, num: 100
+      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
     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

data/lib/tuscan/iec60751.rb

@@ -1,8 +1,15 @@
+require 'rical'
+
 module Tuscan
   module Iec60751
+    R0 = 100.0
+    A  =   3.9083e-03
+    B  =  -5.7750e-07
+    C  =  -4.1830e-12
+
     extend self
 
-    def r t90, r0: 100.0, a:3.9083e-03, b:-5.7750e-07, c:-4.1830e-12
+    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)
@@ -10,26 +17,29 @@ module Tuscan
     alias_method :res, :r
     alias_method :resistance, :r
 
-    def t90 r, r0: 100.0, a:3.9083e-03, b:-5.7750e-07, c:-4.1830e-12, err_limit: 1e-4, num_iter: 10
-      return 0 if r == r0
-      t = t90_approximation r
-      return Float::NAN if t.is_a? Complex
-      num_iter.times do
-        slope = (r - r0) / t
-        r_calc = r(t)
-        break if (r_calc - r).abs < slope * err_limit
-        t -= (r_calc - r) / slope
-      end
-      t
+    def t90 r, r0: R0, a: A, b: B, c: C, num: 10, err: 1e-4
+      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
     end
     alias_method :t, :t90
     alias_method :temperature, :t90
 
   private
-    def t90_approximation r, r0: 100.0, a:3.9083e-03, b:-5.7750e-07, c:-4.1830e-12
-      r >= r0 ?
-        (-a + (a**2 - 4 * b * (1 - r / r0))**(0.5)) / (2 * b) :
-        ((r / r0) - 1) / (a + 100 * b)
+    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:
+      r0 * (a + 2*b*t90 - 300*c*t90**2 + 4*c*t90**3)  # valid for t90 < 0
     end
   end
 end

data/lib/tuscan/version.rb

@@ -1,3 +1,3 @@
 module Tuscan
-  VERSION = "0.0.1"
+  VERSION = '0.0.2'
 end

data/spec/tuscan/iec60584_spec.rb

@@ -2,89 +2,88 @@ require 'spec_helper'
 
 #
 # TODO:
-#   1. compute inverse of emfr by iterative process (will pass R, B examples)
-#   2. get aproximate t90 valid fro -270.0..-200.0 (will pass E, K, N, T examples)
-#   3. implement deviation function (polynomial)
+#   1. implement deviation function (polynomial)
+#   2. check B, 0 mV t90 computation (errorin inverse coeffs?)
 #
 module Tuscan
   describe Iec60584 do
     context 'reference functions' do
       examples = {
         b: [
-          # { emf:  0.000, t90:   0.0 },
-          { emf:  0.291, t90: 250.0 },
-          { emf:  1.975, t90: 630.0 },
-          { emf:  1.981, t90: 631.0 },
-          { emf:  5.780, t90:1100.0 },
-          { emf: 13.820, t90:1820.0 }
+          # { emf:  0.000000, t90:   0.0 },
+          { emf:  0.291279, t90: 250.0 },
+          { emf:  1.974546, t90: 630.0 },
+          { emf:  1.980771, t90: 631.0 },
+          { emf:  5.779517, t90:1100.0 },
+          { emf: 13.820279, t90:1820.0 }
         ],
         c: [
-          { emf:  0.000, t90:   0.0 },
-          { emf:  1.451, t90: 100.0 },
-          { emf: 11.778, t90: 660.0 },
-          { emf: 20.066, t90:1100.0 },
-          { emf: 29.402, t90:1680.0 },
-          { emf: 37.107, t90:2320.0 }
+          { emf: -0.000311, t90:   0.0 },
+          { emf:  1.450711, t90: 100.0 },
+          { emf: 11.778492, t90: 660.0 },
+          { emf: 20.066070, t90:1100.0 },
+          { emf: 29.402461, t90:1680.0 },
+          { emf: 37.106593, t90:2320.0 }
         ],
         e: [
-          # { emf: -9.835, t90:-270.0 },
-          { emf: -8.825, t90:-200.0 },
-          { emf: -5.237, t90:-100.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf:  6.319, t90: 100.0 },
-          { emf: 49.917, t90: 660.0 },
-          { emf: 76.373, t90:1000.0 }
+          { emf: -9.834951, t90:-270.0 },
+          { emf: -8.824581, t90:-200.0 },
+          { emf: -5.237184, t90:-100.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf:  6.318930, t90: 100.0 },
+          { emf: 49.917224, t90: 660.0 },
+          { emf: 76.372826, t90:1000.0 }
         ],
         j: [
-          { emf: -8.095, t90:-210.0 },
-          { emf: -4.633, t90:-100.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf: 36.675, t90: 660.0 },
-          { emf: 43.559, t90: 770.0 },
-          { emf: 69.553, t90:1200.0 }
+          { emf: -8.095380, t90:-210.0 },
+          { emf: -4.632524, t90:-100.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf: 36.675405, t90: 660.0 },
+          { emf: 43.559497, t90: 770.0 },
+          { emf: 69.553180, t90:1200.0 }
         ],
         k: [
-          # { emf: -6.458, t90:-270.0 },
-          { emf: -5.891, t90:-200.0 },
-          { emf: -3.554, t90:-100.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf:  5.206, t90: 127.0 },
-          { emf: 27.447, t90: 660.0 },
-          { emf: 54.886, t90:1372.0 }
+          { emf: -6.457738, t90:-270.0 },
+          { emf: -5.891404, t90:-200.0 },
+          { emf: -3.553631, t90:-100.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf:  5.206093, t90: 127.0 },
+          { emf: 27.447068, t90: 660.0 },
+          { emf: 54.886364, t90:1372.0 }
         ],
         n: [
-          # { emf: -4.345, t90:-270.0 },
-          { emf: -3.990, t90:-200.0 },
-          { emf: -2.407, t90:-100.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf:  2.774, t90: 100.0 },
-          { emf: 22.958, t90: 660.0 },
-          { emf: 47.513, t90:1300.0 }
+          { emf: -4.3451354, t90:-270.0 },
+          { emf: -3.990376, t90:-200.0 },
+          { emf: -2.406811, t90:-100.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf:  2.774124, t90: 100.0 },
+          { emf: 22.957828, t90: 660.0 },
+          { emf: 47.512772, t90:1300.0 }
         ],
         r: [
-          # { emf: -0.226, t90: -50.0 },
-          { emf: -0.123, t90: -25.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf:  6.273, t90: 660.0 },
-          { emf: 11.850, t90:1100.0 },
-          { emf: 21.101, t90:1768.0 }
+          { emf: -0.226465, t90: -50.0 },
+          { emf: -0.123155, t90: -25.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf:  6.273327, t90: 660.0 },
+          { emf: 11.849642, t90:1100.0 },
+          { emf: 21.101477, t90:1768.0 }
         ],
         s: [
-          { emf: -0.236, t90: -50.0 },
-          { emf: -0.127, t90: -25.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf:  5.857, t90: 660.0 },
-          { emf: 10.757, t90:1100.0 },
-          { emf: 18.693, t90:1768.0 }
+          { emf: -0.235555, t90: -50.0 },
+          { emf: -0.126831, t90: -25.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf:  5.856769, t90: 660.0 },
+          { emf: 10.756545, t90:1100.0 },
+          { emf: 18.692510, t90:1768.0 }
         ],
         t: [
-          # { emf: -6.258, t90:-270.0 },
-          { emf: -5.603, t90:-200.0 },
-          { emf: -3.379, t90:-100.0 },
-          { emf:  0.000, t90:   0.0 },
-          { emf:  4.279, t90: 100.0 },
-          { emf:  9.288, t90: 200.0 },
-          { emf: 20.872, t90: 400.0 }
+          { emf: -6.257505, t90:-270.0 },
+          { emf: -5.602961, t90:-200.0 },
+          { emf: -3.378582, t90:-100.0 },
+          { emf:  0.000000, t90:   0.0 },
+          { emf:  4.278519, t90: 100.0 },
+          { emf:  9.288102, t90: 200.0 },
+          { emf: 20.871970, t90: 400.0 }
         ]
       }
 
@@ -93,7 +92,7 @@ module Tuscan
           context "on a type #{type.upcase} thermocouple" do
             examples[type].each do |example|
               it "yields #{example[:emf]} mV when t90 equals #{example[:t90]} ºC" do
-                expect(Iec60584.emfr(example[:t90], type)).to be_within(1e-3).of(example[:emf])
+                expect(Iec60584.emfr(example[:t90], type)).to be_within(1e-6).of(example[:emf])
               end
             end
           end
@@ -105,7 +104,7 @@ 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(0.1).of(example[:t90])
+                expect(Iec60584.t90r(example[:emf], type)).to be_within(1e-3).of(example[:t90])
               end
             end
           end

data/tuscan.gemspec

@@ -4,22 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'tuscan/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "tuscan"
+  spec.name          = 'tuscan'
   spec.version       = Tuscan::VERSION
-  spec.authors       = ["Luis Bacelar"]
-  spec.email         = ["lmbacelar@gmail.com"]
+  spec.authors       = ['Luis Bacelar']
+  spec.email         = ['lmbacelar@gmail.com']
   spec.summary       = %q{Converts to and from temperature for standard (S)PRT's and thermocouples}
-  spec.description   = %q{Converts from electrical signal to temperature and vice-versa for ITS-90 SPRT's, IEC 60751 PRT's and IEC 60584 thermocouples}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.description   = <<-DESC
+Converts from from temperature sensor's electrical signal to temperature and vice-versa.
+Allowable sensors: ITS-90 compliant SPRT's, IEC 60751 compliant PRT's and IEC 60584 compliant thermocouples.
+DESC
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+  spec.add_development_dependency 'rical', '~> 1.2'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'byebug'
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: tuscan
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Luis Bacelar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-13 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rical
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,8 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Converts from electrical signal to temperature and vice-versa for ITS-90
-  SPRT's, IEC 60751 PRT's and IEC 60584 thermocouples
+description: |
+  Converts from from temperature sensor's electrical signal to temperature and vice-versa.
+  Allowable sensors: ITS-90 compliant SPRT's, IEC 60751 compliant PRT's and IEC 60584 compliant thermocouples.
 email:
 - lmbacelar@gmail.com
 executables: []