num4diff 0.4.6 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff5e1dfd13b71508a48cf82c7e4cfdb28f83971c410a4d33aeabf2807c840b04
-  data.tar.gz: 67d9c83ef8cef833b636aedd31c0f686d0066272560c670159fef169e91aca4a
+  metadata.gz: 4032b47cfd83b41e99e62fb6d2f7085af8c17692de3a7f40abc3480073213d28
+  data.tar.gz: 725a5365017a298863de4504382f47ef2340e0b52976eb925164269509809991
 SHA512:
-  metadata.gz: f2a668107ed2dbe416f00a1a16ef6eda01832894fe5c2b8153efb948b440fa591d9ef4d33b0187da7e6fcf73dadb306c3c3b6f15f4f372cfd6a91b204e6bceae
-  data.tar.gz: ed3e97fa67b1dc82dc409a3ed8c4a2606c6f08a6a12d5c1d690e144c3fb31d98c245decb48284abdedc3e8a56e624ef68a8b44dcaa78a88a242d9f8d57421cbe
+  metadata.gz: 810201bbeef874ac1c946cf454815fb0eb7dcc72cadd5b4ffd5f1150c3bcb5942e342127ef1b2440794a44e797e40922ab5aae55d8ba7be42fb63ab69ec7bcef
+  data.tar.gz: e330e6e32a55a08798682bdcd83e47b4e9b591d2489491884f07a43b86b530ae95628c2b08578ef112adbd13526a8ddc96645afa437ecfb078436597e3ffd2c5

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## Unreleased
 
-## [0.4.5] - 2023-04-24
+## [0.5.2] - 2023-06-08
+
+### Fixed
+- Fix refactor to adamsBashforthMethod and adamsMoultonMethod.
+
+## [0.5.1] - 2023-05-18
+
+### Fixed
+- Fix correspondence of k step.
+
+### Changed
+- chg wiki-uri
+
+## [0.4.6] - 2023-04-24
 
 ### Fixed
 - Fix Split into single-step and multi-step solutions.

data/ext/num4diff/CNum4Diff.c

@@ -6,8 +6,8 @@
 static double CNum4Diff_doEulerMethod(double yi, double xi, double h, Func func);
 static double CNum4Diff_doHeunMethod(double yi, double xi, double h, Func func);
 static double CNum4Diff_doRungeKuttaMethod(double yi, double xi, double h, Func func);
-static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double y0, double h, Func func);
-static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double y0, double h, Func func);
+static double CNum4Diff_doAdamsBashforthMethod(int k, double a, double b, double y0, double h, Func func);
+static double CNum4Diff_doAdamsMoultonMethod(int k, double a, double b, double y0, double h, Func func);
 static CNum4Diff _cNum4Diff = {
     .tierMethod = {
 	.FP_eulerMethod          = CNum4Diff_doEulerMethod,
@@ -19,6 +19,35 @@ static CNum4Diff _cNum4Diff = {
 	.FP_adamsMoultonMethod   = CNum4Diff_doAdamsMoultonMethod,
     },
 };
+/* アダムステーブル */
+static AdamsTbl bash[] = {
+    [0] = {.s = 2,                     // k = 2
+           .bv = {[0] = 3,   [1] = -1}
+          },          
+    [1] = {.s = 12,                    // k = 3
+           .bv = {[0] = 23,  [1] = -16,  [2] = 5}
+          },
+    [2] = {.s = 24,                    // k = 4
+           .bv = {[0] = 55,  [1] = -59,  [2] = 37,  [3] = -9}
+          }, 
+    [3] = {.s = 720,                   // k = 5
+           .bv = {[0] = 1901,[1] = -2774,[2] = 2616,[3] = -1274, [4] = 251}
+          }, 
+};
+static AdamsTbl moulton[] = {
+    [0] = {.s = 2,                     // k = 2
+           .bv = {[0] = 1,  [1] = 1}
+          },           
+    [1] = {.s = 12,                    // k = 3
+           .bv = {[0] = 5,  [1] = 8,  [2] = -1}
+          },
+    [2] = {.s = 24,                    // k = 4
+           .bv = {[0] = 9,  [1] = 19, [2] = -5,  [3] = 1}
+          }, 
+    [3] = {.s = 720,                   // k = 5
+          .bv = {[0] = 251,[1] = 646,[2] = -264,[3] = 106,[4] = -19}
+          }, 
+};
 /**************************************/
 /* InterFface部                       */
 /**************************************/
@@ -43,19 +72,21 @@ double CNum4Diff_Tier_rungeKuttaMethod(double yi, double xi, double h, Func func
 
     return _cNum4Diff.tierMethod.FP_rungeKuttaMethod(yi, xi, h, func);
 }
-double CNum4Diff_Multistage_adamsBashforthMethod(double a, double b, double y0, double h, Func func)
+double CNum4Diff_Multistage_adamsBashforthMethod(int k, double a, double b, double y0, double h, Func func)
 {
     assert(func != 0);
     assert(a < b);
+    assert((1 < k) && (k < 6));
 
-    return _cNum4Diff.multistageMethod.FP_adamsBashforthMethod(a, b, y0, h, func);
+    return _cNum4Diff.multistageMethod.FP_adamsBashforthMethod(k, a, b, y0, h, func);
 }
-double CNum4Diff_Multistage_adamsMoultonMethod(double a, double b, double y0, double h, Func func)
+double CNum4Diff_Multistage_adamsMoultonMethod(int k, double a, double b, double y0, double h, Func func)
 {
     assert(func != 0);
     assert(a < b);
+    assert((1 < k) && (k < 6));
 
-    return _cNum4Diff.multistageMethod.FP_adamsMoultonMethod(a, b, y0, h, func);
+    return _cNum4Diff.multistageMethod.FP_adamsMoultonMethod(k, a, b, y0, h, func);
 }
 /**************************************/
 /* 処理実行部                         */
@@ -101,50 +132,75 @@ static double CNum4Diff_doRungeKuttaMethod(double yi, double xi, double h, Func
     return yi + (k1 + 2 * k2 + 2 * k3 + k4) / 6.0; 
 }
 /*
- * アダムス・バッシュフォース法(3段)
+ * アダムス・バッシュフォース法(k段)
  */
-static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double y0, double h, Func func)
+static double CNum4Diff_doAdamsBashforthMethod(int k, double a, double b, double y0, double h, Func func)
 {
     double xi = a;
-    double fi;
-    double fi1 = 0;
-    double fi2 = 0;
     double y = 0.0;
+    double *f = malloc(sizeof(double) * k);
+    int i;
+    double bk;
+    AdamsTbl *ptBash = &bash[k - 2];
 
-    fi2  = y0;
-    xi = xi + h;
-    fi1  = CNum4Diff_Tier_rungeKuttaMethod(fi2, xi, h, func);
-    y = fi1;
+    f[k - 1] = y0;
+    for (i = 0; i < k - 2; i++) {
+        f[k - (i + 2)] =  CNum4Diff_Tier_rungeKuttaMethod(f[k - (i + 1)], xi, h, func);
+    }
     for (xi = xi + h; xi < b; xi += h) {
-        fi  = CNum4Diff_Tier_rungeKuttaMethod(fi1, xi, h, func);
-        y = y + h * (23 * fi - 16 * fi1 + 5 * fi2) / 12.0;
-        fi2 = fi1;
-        fi1 = fi;
+        f[0]  = CNum4Diff_Tier_rungeKuttaMethod(f[1], xi, h, func);
+        // 予測子
+        bk = 0.0;
+        for (i = 0; i < k; i++) {
+            bk += ptBash->bv[i] * f[i];
+        }
+        y = f[0] + h * bk / ptBash->s;
+        // f値をずらす
+        for (i = 0; i < k - 1; i++) {
+            f[k - (i + 1)] = f[k - (i + 2)];
+        }
     }
     return y;
 }
 /*
- * アダムス・ムルトン法(3段)
+ * アダムス・ムルトン法(k段)
  */
-static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double y0, double h, Func func)
+static double CNum4Diff_doAdamsMoultonMethod(int k, double a, double b, double y0, double h, Func func)
 {
     double xi = a;
-    double fi;
-    double fi1 = 0;
-    double fi2 = 0;
     double y_pred = 0.0;
     double y = 0.0;
+    double *f = malloc(sizeof(double) * k);
+    double *f2 = malloc(sizeof(double) * (k + 1));
+    int i;
+    double bk;
+    AdamsTbl *ptBash = &bash[k - 2];
+    AdamsTbl *ptMoulton = &moulton[k - 2];
 
-    fi2  = y0;
-    xi = xi + h;
-    fi1  = CNum4Diff_Tier_rungeKuttaMethod(fi2, xi, h, func);
-    y = fi1;
+    f[k - 1] = y0;
+    for (i = 0; i < k - 2; i++) {
+        f[k - (i + 2)] =  CNum4Diff_Tier_rungeKuttaMethod(f[k - (i + 1)], xi, h, func);
+    }
     for (xi = xi + h; xi < b; xi += h) {
-        fi  = CNum4Diff_Tier_rungeKuttaMethod(fi1, xi, h, func);
-        y_pred = y + h * (23 * fi - 16 * fi1 + 5 * fi2) / 12.0;
-        y = y + h * (5 * y_pred  + 8 * fi -1 * fi1) / 12.0;
-        fi2 = fi1;
-        fi1 = fi;
+        f[0]  = CNum4Diff_Tier_rungeKuttaMethod(f[1], xi, h, func);
+        // 予測子
+        bk = 0.0;
+        for (i = 0; i < k; i++) {
+            bk += ptBash->bv[i] * f[i];
+            f2[i + 1] = f[i];
+        }
+        y_pred = f[0] + h * bk / ptBash->s;
+        f2[0] = y_pred;
+        // 修正子
+        bk = 0.0;
+        for (i = 0; i < k; i++) {
+            bk += ptMoulton->bv[i] * f2[i];
+        }
+        y = f[0] + h * bk / ptMoulton->s;
+        // f値をずらす
+        for (i = 0; i < k - 1; i++) {
+            f[k - (i + 1)] = f[k - (i + 2)];
+        }
     }
     return y;
 }

data/ext/num4diff/CNum4Diff.h

@@ -8,7 +8,13 @@ typedef struct _CNum4Diff           CNum4Diff;
 typedef struct _CNum4DiffTier       CNum4DiffTier;
 typedef struct _CNum4DiffMultistage CNum4DiffMultistage;
 typedef double (*Func)(double x);
+typedef struct _AdamsTbl            AdamsTbl;
 
+struct _AdamsTbl
+{
+    int s;
+    int bv[5];
+};
 struct _CNum4DiffTier
 {
     double (*FP_eulerMethod)(double yi, double xi, double h, Func func);
@@ -17,8 +23,8 @@ struct _CNum4DiffTier
 };
 struct _CNum4DiffMultistage
 {
-	double (*FP_adamsBashforthMethod)(double a, double b, double y0, double h, Func func);
-	double (*FP_adamsMoultonMethod)(double a, double b, double y0, double h, Func func);
+    double (*FP_adamsBashforthMethod)(int k, double a, double b, double y0, double h, Func func);
+    double (*FP_adamsMoultonMethod)(int k, double a, double b, double y0, double h, Func func);
 ;
 };
 struct _CNum4Diff
@@ -35,6 +41,6 @@ struct _CNum4Diff
 double CNum4Diff_Tier_eulerMethod(double yi, double xi, double h, Func func);
 double CNum4Diff_Tier_heunMethod(double yi, double xi, double h, Func func);
 double CNum4Diff_Tier_rungeKuttaMethod(double yi, double xi, double h, Func func);
-double CNum4Diff_Multistage_adamsBashforthMethod(double a, double b, double y0, double h, Func func);
-double CNum4Diff_Multistage_adamsMoultonMethod(double a, double b, double y0, double h, Func func);
+double CNum4Diff_Multistage_adamsBashforthMethod(int k, double a, double b, double y0, double h, Func func);
+double CNum4Diff_Multistage_adamsMoultonMethod(int k, double a, double b, double y0, double h, Func func);
 #endif

data/lib/num4diff.rb

@@ -52,8 +52,9 @@ module Num4DiffLib
     attach_function :rungeKuttaMethod,
         :CNum4Diff_Tier_rungeKuttaMethod, [:double, :double, :double, :f], :double
     #
-    # アダムス・バッシュフォース法(3段)による数値計算
-    # @overload adamsBashforthMethod(a, b, y0, h, func)
+    # アダムス・バッシュフォース法(k段)による数値計算
+    # @overload adamsBashforthMethod(k, a, b, y0, h, func)
+    #   @param [int]    k k段アダムス法
     #   @param [double] a 下限値
     #   @param [double] b 上限値
     #   @param [double] y0 y(x0=a)の値
@@ -62,10 +63,11 @@ module Num4DiffLib
     #   @return [double] [a,b]の積分値
     #
     attach_function :adamsBashforthMethod,
-        :CNum4Diff_Multistage_adamsBashforthMethod, [:double, :double, :double, :double, :f], :double
+        :CNum4Diff_Multistage_adamsBashforthMethod, [:int, :double, :double, :double, :double, :f], :double
     #
-    # アダムス・ムルトン法(3段)による数値計算
-    # @overload adamsMoultonMethod(a, b, y0, xi, h, func)
+    # アダムス・ムルトン法(k段)による数値計算
+    # @overload adamsMoultonMethod(k, a, b, y0, xi, h, func)
+    #   @param [int]    k k段アダムス法
     #   @param [double] a 下限値
     #   @param [double] b 上限値
     #   @param [double] y0 y0 y(x0=a)の値
@@ -74,5 +76,5 @@ module Num4DiffLib
     #   @return [double] [a,b]の積分値
     #
     attach_function :adamsMoultonMethod,
-        :CNum4Diff_Multistage_adamsMoultonMethod, [:double, :double, :double, :double, :f], :double
+        :CNum4Diff_Multistage_adamsMoultonMethod, [:int, :double, :double, :double, :double, :f], :double
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4diff
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.2
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-06-08 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/num4different/blob/main/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/num4diff/0.4.6
+  documentation_uri: https://rubydoc.info/gems/num4diff/0.5.2
   homepage_uri: http://github.com/siranovel/num4different
+  wiki_uri: https://github.com/siranovel/mydocs/tree/main/num4different
 post_install_message: 
 rdoc_options: []
 require_paths: