rical 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 773c7c61e53f2619431d5434ee3454d966485e7a
-  data.tar.gz: 0864d8f3304f2b33347a67ac4aaaa93cee40439d
+  metadata.gz: e3b9ddaa4411eba88fbd4ed7da72847ab4ec2941
+  data.tar.gz: 366b872dd1f11c1fa557449c5d02785a2ca8f66f
 SHA512:
-  metadata.gz: 43242221a009ccb3d056639ac56e5edafdffd93ed9904f6775c11164429c5360073d2c9d27a9e49f8a582d87df0d4b12962f4da74f8d2ae68ea6965da563aa24
-  data.tar.gz: 9a003ea7281176124258f083c1a6ea0000bf228b80dc01b191c777caf61572f0be8604176a836c9251494a4300b305aff600999b205132a6a10f9da75db2a9c7
+  metadata.gz: 059ec0e08bd1338050630266c6e8af47fea73ae659f4db102ccb922aa2c23de75420059f85f14985085fc9ff62cfb03fb7f254fea8c0fc55ff0d141419cb0bee
+  data.tar.gz: 0c0ebf9d1b94322e108a85a8b042dc084ebf71bc13567c073be589c387500bfee573930c11186ea59ddbf2f5e8867c24341c28c2b885f3f4fbd73920d58fefca

data/lib/rical.rb

@@ -21,9 +21,9 @@ module Rical
     end
   end
 
-  def inverse_for f:, y: 0.0, **args
-    f_1= -> (x) { f.call(x) - Float(y) }
-    root_for f: f_1, **args
+  def inverse_for f:, fargs: nil, y: 0.0, **args
+    f_1 = compute_f_1 f, fargs, y
+    root_for f: f_1, fargs: fargs, **args
   end
   alias_method :inv_for, :inverse_for
 
@@ -53,8 +53,14 @@ private
   end
 
   def compute f, x, fargs
-    return f.call x          unless fargs
-    return f.call x, **fargs if     fargs.is_a? Hash
-    return f.call x, *fargs
+    return f.call(x         ) unless fargs
+    return f.call(x, **fargs) if     fargs.is_a? Hash
+    return f.call(x,  *fargs)
+  end
+
+  def compute_f_1 f, fargs, y
+    return -> (x       ) { f.call(x)          - Float(y) } unless fargs
+    return -> (x, **arg) { f.call(x, **fargs) - Float(y) } if     fargs.is_a? Hash
+    return -> (x,  *arg) { f.call(x,  *fargs) - Float(y) }
   end
 end

data/lib/rical/version.rb

@@ -1,3 +1,3 @@
 module Rical
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/rical_spec.rb

@@ -3,11 +3,15 @@ require 'spec_helper'
 describe Rical do
   f1  = -> (x) { x**2 - 2 }
   df1 = -> (x) { 2*x }
+  f2  = -> (x, a, b) { a*x**2 + b }    # f2  = f1  for a=1, b=-2
+  df2 = -> (x, a)    { a*x }           # df2 = df1 for a=2
+  f3  = -> (x, a:, b:) { a*x**2 + b }  # f3  = f1  for { a: 1, b: -2 }
+  df3 = -> (x, a:)    { a*x }          # df3 = df1 for { a: 2 }
 
   context 'Newton-Raphson method' do
     context 'root computation' do
       it 'yields +√2 for f(x) = x²-2' do
-        expect(Rical.root_for f: f1, df: df1, x0: 10, method: :newton).to be_within(1e-6).of(2**0.5)
+        expect(Rical.root_for f: f1, df: df1, x0: 10, method: :newton_raphson).to be_within(1e-6).of(2**0.5)
       end
 
       it 'yields -√2 for f(x) = x²-2' do
@@ -15,25 +19,17 @@ describe Rical do
       end
 
       it 'rescues when df(x0) = 0' do
-        expect(Rical.root_for f: f1, df: df1, x0: 0.0, method: :newton).to be_within(1e-6).of(2**0.5)
+        expect(Rical.root_for f: f1, df: df1, x0: 0.0, method: :n).to be_within(1e-6).of(2**0.5)
       end
 
       it 'passes extra arguments (array) to f' do
-        f2  = -> (x, a, b) { a*x**2 + b }    # f2  = f1  for a=1, b=-2
-        df2 = -> (x, a)    { a*x }           # df2 = df1 for a=2
-        expect(Rical.root_for f:  f2,  fargs:  [1, -2],
-                              df: df2, dfargs: 2,
-                              x0: 10,
-                              method: :newton).to be_within(1e-6).of(2**0.5)
+        expect(Rical.root_for f: f2, fargs: [1,-2], df: df2, dfargs: 2, x0: 10, method: :n).
+          to be_within(1e-6).of(2**0.5)
       end
 
       it 'passes extra arguments (hash) to f' do
-        f3  = -> (x, a:, b:) { a*x**2 + b }   # f3  = f1  for { a: 1, b: -2 }
-        df3 = -> (x, a:)    { a*x }           # df3 = df1 for { a: 2 }
-        expect(Rical.root_for f:  f3,  fargs:  { a: 1, b: -2 },
-                              df: df3, dfargs: { a: 2 },
-                              x0: 10,
-                              method: :newton).to be_within(1e-6).of(2**0.5)
+        expect(Rical.root_for f: f3, fargs: {a:1, b:-2}, df: df3, dfargs: {a:2}, x0: 10, method: :n).
+          to be_within(1e-6).of(2**0.5)
       end
     end
 
@@ -41,6 +37,16 @@ describe Rical do
       it 'yields +2.0 for y=2, f(x)=y=x²-2' do
         expect(Rical.inverse_for f: f1, df: df1, y: 2, x0: 0, method: :newton).to be_within(1e-6).of(2.0)
       end
+
+      it 'passes extra arguments (array) to f' do
+        expect(Rical.inverse_for f: f2, fargs: [1,-2], df: df2, dfargs: 2, y: 2, x0: 10, method: :n).
+          to be_within(1e-6).of(2.0)
+      end
+
+      it 'passes extra arguments (hash) to f' do
+        expect(Rical.inverse_for f: f3, fargs: {a:1,b:-2}, df: df3, dfargs: {a:2}, y: 2, x0: 10, method: :n).
+          to be_within(1e-6).of(2.0)
+      end
     end
 
   end
@@ -52,23 +58,26 @@ describe Rical do
       end
 
       it 'yields -√2 for f(x) = x²-2' do
-        expect(Rical.root_for f: f1, x0: -10, x1: -9, method: :secant).to be_within(1e-6).of(-2**0.5)
+        expect(Rical.root_for f: f1, x0: -10, x1: -9, method: :sec).to be_within(1e-6).of(-2**0.5)
       end
 
-      it 'rescues when f(x1) - f(x0) = 0' do
-        # converges to either one of the roots
-        expect(Rical.root_for(f: f1, x0: 9, x1: -9, method: :secant).abs).to be_within(1e-6).of(2**0.5)
+      it 'rescues when f(x1) - f(x0) = 0 and converges to one of the roots' do
+        expect(Rical.root_for(f: f1, x0: 9, x1: -9, method: :s).abs).to be_within(1e-6).of(2**0.5)
       end
 
       it 'passes extra arguments (array) to f' do
         f2  = -> (x, a, b) { a*x**2 + b }    # f2  = f1  for a=1, b=-2
-        expect(Rical.root_for f: f2, fargs: [1, -2], x0: 10, x1: 9, method: :secant).to be_within(1e-6).of(2**0.5)
+        expect(Rical.root_for f: f2, fargs: [1, -2], x0: 10, x1: 9, method: :s).to be_within(1e-6).of(2**0.5)
       end
     end
 
     context 'inverse computation' do
       it 'yields +2.0 for y=2, f(x)=y=x²-2' do
-        expect(Rical.inverse_for f: f1, y: 2, x0: 0, x1: 1, method: :secant).to be_within(1e-6).of(2.0)
+        expect(Rical.inverse_for f: f1, y: 2, x0: 0, x1: 1, method: :sec).to be_within(1e-6).of(2.0)
+      end
+
+      it 'passes extra arguments (array) to f' do
+        expect(Rical.inverse_for f: f2, fargs: [1, -2], y: 2, x0: 10, x1: 9, method: :s).to be_within(1e-6).of(2.0)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rical
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Luis Bacelar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler