num4equ 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df19fd2bb0a886f566c14a1cbfc2a4cc27de3f720a6cd96fa664e10d14a5d412
-  data.tar.gz: 31f369bdc107b02c4aa6472dc38c5ebcecd46f4ec74f380d24c0d4f2c003685d
+  metadata.gz: 4441f4b5ae669c3fd23a7c5a18ec3e5b8ad1978dac7b35182efa2ca405bda1b9
+  data.tar.gz: d91a9cfc49ae241e825559436fc2e2e88c6a2af427b05be6e6355d8c8390b6a5
 SHA512:
-  metadata.gz: c45aa264ded3405d2e9fac971f3dc79ed51fb135a577b823ac64b463a6c2a7d52684897e46d791bb985310b6f3da449759c77006ab143a80966fdbbb00740546
-  data.tar.gz: ed545922c2a69db002d7d49b6caeb583caac170292e2e4503831ed178bcccefc85b6079d00fcdee9ff77d2b5aac4eeff3e61f1674d3087907798a89fd5fcfa52
+  metadata.gz: 432f514112960806adc43ca26e4627aa0faf4dd1a164a8356aab04eaa532a49f1c38920327f34cfebe9fa0143016863be0777f0c0c838463430fbc8179dc4909
+  data.tar.gz: f20d5d091abe3c49fd7202afa6f6acd09b1fa7f74fdd71b48f67f8f545b676a6012907e1029d59c8575c7ec3e932b5ba40a313159cb791bca5fc26a431403fee

data/CHANGELOG.md

@@ -2,10 +2,15 @@
 
 ## Unreleased
 
+## [0.0.9] - 2023-04-18 
+
+### Added
+- Add function of secantMethod.
+
 ## [0.0.8] - 2023-04-17 
 
 ### Added
-- Add file of LICENSE.
+- Add file of CHANGELOH.md.
 
 ## [0.0.7] - 2023-03-17
 

data/ext/num4equ/CNum4Equ.c

@@ -6,10 +6,12 @@
 
 static double CNum4Equ_doNewtonMethodFFI(double a, Func func, DFunc dFunc, int *ok);
 static double CNum4Equ_doBisectionMethodFFI(double a, double b, Func func, int *ok);
+static double CNum4Equ_doSecantMethodFFI(double a, double b, Func func, int *ok);
 
 static CNum4Equ _cNum4Equ = {
     .FP_newtonMethodFFI = CNum4Equ_doNewtonMethodFFI,
     .FP_bisectionMethodFFI = CNum4Equ_doBisectionMethodFFI,
+    .FP_secantMethodFFI = CNum4Equ_doSecantMethodFFI,
 };
 
 /**************************************/
@@ -32,6 +34,13 @@ double CNum4Equ_bisectionMethodFFI(double a, double b, Func func, int *ok)
 
     return _cNum4Equ.FP_bisectionMethodFFI(a, b, func, ok);
 }
+double CNum4Equ_secantMethodFFI(double a, double b, Func func, int *ok)
+{
+    assert(func != 0);
+    assert(a < b);
+
+    return _cNum4Equ.FP_secantMethodFFI(a, b, func, ok);
+}
 /**************************************/
 /* 処理実行部                         */
 /**************************************/
@@ -67,7 +76,7 @@ static double CNum4Equ_doBisectionMethodFFI(double a, double b, Func func, int *
     double xc;
 
     *ok = (fa * fb) < 0 ? 0 : -1; 
-    if (0 != *ok) { return 0; }
+    if (0 != ok) { return 0; }
     do {
         xc = (a + b) / 2.0;
         fxc = func(xc);
@@ -81,4 +90,33 @@ static double CNum4Equ_doBisectionMethodFFI(double a, double b, Func func, int *
     } while(fxc != 0 && fabs(b - a) > EPS);
     return xc; 
 }
+static double CNum4Equ_doSecantMethodFFI(double a, double b, Func func, int *ok)
+{
+    double new_x = 0.0;
+    double x_n = b;
+    double x_n_1 = a;
+    double fa = 0.0;
+    double fb = 0.0;
+    double df;
+    long idx = 0;
+
+    *ok = 0; 
+    do {
+        fa = func(x_n_1);
+        fb = func(x_n);
+        df = (x_n - x_n_1 ) / (fb - fa);
+        new_x = x_n - fb * df;
+        if (fabs(fb * df) < EPS) break;
+        if (fabs(func(new_x)) < EPS) break;
+        idx++;
+        if (100000 < idx) {
+            *ok = -1;
+            break;
+        } 
+        x_n_1 = x_n;
+        x_n = new_x;
+    } while(1);
+    return new_x;
+}
+
 

data/ext/num4equ/CNum4Equ.h

@@ -12,6 +12,7 @@ struct _CNum4Equ
 {
     double (*FP_newtonMethodFFI)(double a, Func func, DFunc dFunc, int *ok);
     double (*FP_bisectionMethodFFI)(double a, double b, Func func, int *ok);
+    double (*FP_secantMethodFFI)(double a, double b, Func func, int *ok);
 };
 /**********************************************/
 /* definen宣言                                */
@@ -22,4 +23,5 @@ struct _CNum4Equ
 /**********************************************/
 double CNum4Equ_newtonMethodFFI(double a, Func func, DFunc dFunc, int *ok);
 double CNum4Equ_bisectionMethodFFI(double a, double b, Func func, int *ok);
+double CNum4Equ_secantMethodFFI(double a, double b, Func func, int *ok);
 #endif

data/lib/num4equ.rb

@@ -8,13 +8,23 @@ module Num4EquLib
     extend FFI::Library
 
     ffi_lib FFI::Compiler::Loader.find('num4equ') 
+    # @overload func(a)
+    #   @yield [a] 関数  
+    #   @yieldparam [double] aの値
+    #   @return [double] xの値
     callback   :f, [:double], :double
+    # @overload dfunc(a)
+    #   @yield [a] 関数に対する微分関数  
+    #   @yieldparam [double] aの値
+    #   @return [double] xの値
     callback   :df, [:double], :double
 
     attach_function :newtonMethodFFI,
         :CNum4Equ_newtonMethodFFI, [:double, :f, :df, :buffer_out], :double
     attach_function :bisectionMethodFFI,
         :CNum4Equ_bisectionMethodFFI, [:double, :double, :f, :buffer_out], :double
+    attach_function :secantMethodFFI,
+        :CNum4Equ_secantMethodFFI, [:double, :double, :f, :buffer_out], :double
     class << self
         # @overload newtonMethod(a, func, dfunc)
         #   ニュートン法による解法
@@ -50,7 +60,26 @@ module Num4EquLib
             end
             return x
         end
+        # @overload secantMethod(a, b, func)
+        #   割線法による解法
+        #   @param [double] a aの値
+        #   @param [double] b bの値
+        #   @param [callback] func aに対する値を計算
+        #   @return [double] xの値
+        #   @raise RangeError
+        def secantMethod(a, b, func)
+            ok_ptr = FFI::MemoryPointer.new :int 
+            x = secantMethodFFI(a, b, func, ok_ptr)
+            ok = ok_ptr.read_int
+            ok_ptr.free()
+            if ok < 0 then
+                raise RangeError.new("a:" + a.to_s + " " + "b:" + b.to_s)
+            end
+            return x
+        end
 
-        private :newtonMethodFFI, :bisectionMethodFFI
+        private :newtonMethodFFI
+        private :bisectionMethodFFI
+        private :secantMethodFFI
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4equ
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-16 00:00:00.000000000 Z
+date: 2023-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -69,7 +69,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: http://github.com/siranovel/num4equation/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/num4equ/0.0.8
+  documentation_uri: https://rubydoc.info/gems/num4equ/0.0.9
   homepage_uri: http://github.com/siranovel/num4equation
 post_install_message: 
 rdoc_options: []