num4equ 0.0.9 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4441f4b5ae669c3fd23a7c5a18ec3e5b8ad1978dac7b35182efa2ca405bda1b9
-  data.tar.gz: d91a9cfc49ae241e825559436fc2e2e88c6a2af427b05be6e6355d8c8390b6a5
+  metadata.gz: c9999f0550bf5719b1f533abe772b711527b6ca26608f910fc53866944eea78e
+  data.tar.gz: 1e898d1910107d1b81ea430ed79bdc92874413ce0320a992873bcc1c63d23f42
 SHA512:
-  metadata.gz: 432f514112960806adc43ca26e4627aa0faf4dd1a164a8356aab04eaa532a49f1c38920327f34cfebe9fa0143016863be0777f0c0c838463430fbc8179dc4909
-  data.tar.gz: f20d5d091abe3c49fd7202afa6f6acd09b1fa7f74fdd71b48f67f8f545b676a6012907e1029d59c8575c7ec3e932b5ba40a313159cb791bca5fc26a431403fee
+  metadata.gz: 71701934716dc8bd1ab3952a226cb00741fd9a335a7030328747bda8dc981b1a891a388d693a89fa72a4421b44e6446472a0ecc99bdb995576504819e9eaa955
+  data.tar.gz: 548a45584072da76972d4e964df7cd46b58e371c53106a978aa449abc29372552a46f726c3f1aac6016bb1df1837dcb4c98ea0a7dc97c677ae259de63ad8fe32

data/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+## [0.1.2] - 2023-05-28
+
+### fixed
+- fix refactoring for newtonMethod 
+
+## [0.1.1] - 2023-05-20
+
+### fixed
+- fix use definition of derivative for newtonMethod  
+
+### Added
+- Add wiki_rui into file of gemspec.
+
 ## [0.0.9] - 2023-04-18 
 
 ### Added

data/ext/num4equ/CNum4Equ.c

@@ -4,7 +4,7 @@
 #include <math.h>
 #include "CNum4Equ.h"
 
-static double CNum4Equ_doNewtonMethodFFI(double a, Func func, DFunc dFunc, int *ok);
+static double CNum4Equ_doNewtonMethodFFI(double a, Func func, 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);
 
@@ -20,12 +20,11 @@ static CNum4Equ _cNum4Equ = {
 /**************************************/
 /* Class部                            */
 /**************************************/
-double CNum4Equ_newtonMethodFFI(double a, Func func, DFunc dFunc, int *ok)
+double CNum4Equ_newtonMethodFFI(double a, Func func, int *ok)
 {
     assert(func != 0);
-    assert(dFunc != 0);
 
-    return _cNum4Equ.FP_newtonMethodFFI(a, func, dFunc, ok);
+    return _cNum4Equ.FP_newtonMethodFFI(a, func, ok);
 }
 double CNum4Equ_bisectionMethodFFI(double a, double b, Func func, int *ok)
 {
@@ -42,32 +41,41 @@ double CNum4Equ_secantMethodFFI(double a, double b, Func func, int *ok)
     return _cNum4Equ.FP_secantMethodFFI(a, b, func, ok);
 }
 /**************************************/
-/* 処理実行部                         */
+/* 処理実行部                          */
 /**************************************/
-static double CNum4Equ_doNewtonMethodFFI(double a, Func func, DFunc dFunc, int *ok)
+/*
+ * ニュートン法
+ */
+static double CNum4Equ_doNewtonMethodFFI(double a, Func func, int *ok)
 {
-    double xn;
-    double x0 = a;
+    double xn = a;
+    double xn_1;
     long idx = 0;
 
     *ok = 0;
-    xn = x0;
     do {
-        double f;
-        double df;
+        double fx;
+        double fxh;
 
-        x0 = xn;
-        f = func(x0);
-        df = dFunc(x0);
-        xn = -1 * f / df + x0;
+        // xn_1 = xn - f(x)/f'(x)
+        // f'(x) = lim    (f(x + h) - f(x)) / h
+        //         h -> 0
+        fx = func(xn);
+        fxh = func(xn + DX);
+        xn_1 = xn + -1 * DX * fx / (fxh - fx);
+        if (fabs(xn_1 - xn) < EPS) break;
+        xn = xn_1;
         idx++;
         if (100000 < idx) {
             *ok = -1;
             break;
         } 
-    } while(fabs(xn - x0) > EPS);
+    } while(1);
     return xn;
 }
+/*
+ * ２分法
+ */
 static double CNum4Equ_doBisectionMethodFFI(double a, double b, Func func, int *ok)
 {
     double fa = func(a);
@@ -76,7 +84,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);
@@ -90,6 +98,9 @@ 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;
@@ -119,4 +130,3 @@ static double CNum4Equ_doSecantMethodFFI(double a, double b, Func func, int *ok)
     return new_x;
 }
 
-

data/ext/num4equ/CNum4Equ.h

@@ -6,22 +6,22 @@
 /**********************************************/
 typedef struct _CNum4Equ CNum4Equ;
 typedef double (*Func)(double x);
-typedef double (*DFunc)(double x);
 
 struct _CNum4Equ
 {
-    double (*FP_newtonMethodFFI)(double a, Func func, DFunc dFunc, int *ok);
+    double (*FP_newtonMethodFFI)(double a, Func func, 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宣言                                */
 /**********************************************/
-#define EPS (1.0e-6)
+#define EPS (1.0e-7)
+#define DX  0.001
 /**********************************************/
 /* プロトタイプ宣言                           */
 /**********************************************/
-double CNum4Equ_newtonMethodFFI(double a, Func func, DFunc dFunc, int *ok);
+double CNum4Equ_newtonMethodFFI(double a, Func func, 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

@@ -13,29 +13,23 @@ module Num4EquLib
     #   @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
+        :CNum4Equ_newtonMethodFFI, [:double, :f, :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)
+        # @overload newtonMethod(a, func)
         #   ニュートン法による解法
         #   @param [double] a aの値
         #   @param [callback] func aに対する値を計算
-        #   @param [callback] dfunc fに対する微分関数
         #   @return [double] xの値
         #   @raise RangeError
-        def newtonMethod(a, func, dfunc)
+        def newtonMethod(a, func)
             ok_ptr = FFI::MemoryPointer.new :int 
-            x = newtonMethodFFI(a, func, dfunc, ok_ptr)
+            x = newtonMethodFFI(a, func, ok_ptr)
             ok = ok_ptr.read_int
             ok_ptr.free()
             if ok < 0 then
@@ -77,7 +71,6 @@ module Num4EquLib
             end
             return x
         end
-
         private :newtonMethodFFI
         private :bisectionMethodFFI
         private :secantMethodFFI

metadata

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