num4diff 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc6954bb9f3eb7e7b35429c7f4429aa60f5a998ce1934dbe79b0117ae1013a51
-  data.tar.gz: 3caa0e4e7b083a435b374c0739134ac583ab149f30306327783cf239896c263b
+  metadata.gz: ff5e1dfd13b71508a48cf82c7e4cfdb28f83971c410a4d33aeabf2807c840b04
+  data.tar.gz: 67d9c83ef8cef833b636aedd31c0f686d0066272560c670159fef169e91aca4a
 SHA512:
-  metadata.gz: b9e5780c5bbfecb0dd284e561775f78a8cff1530194817f4ac58f22db6f0103e851558a548e3cf04d54e4f4d009a2cad2508d1f5bb6a2e2cf33f8aa59a50174e
-  data.tar.gz: 2d4736748fa20f35f7ba11fa0e614f165d9b30a73038d4942262c30f3951d33db45bf0ffb46970197b45e3d98e51d639365a3845e69a8ebc52c4db309be9569b
+  metadata.gz: f2a668107ed2dbe416f00a1a16ef6eda01832894fe5c2b8153efb948b440fa591d9ef4d33b0187da7e6fcf73dadb306c3c3b6f15f4f372cfd6a91b204e6bceae
+  data.tar.gz: ed3e97fa67b1dc82dc409a3ed8c4a2606c6f08a6a12d5c1d690e144c3fb31d98c245decb48284abdedc3e8a56e624ef68a8b44dcaa78a88a242d9f8d57421cbe

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [0.4.5] - 2023-04-24
+
+### Fixed
+- Fix Split into single-step and multi-step solutions.
+
 ## [0.4.5] - 2023-04-14
 
 ### Fixed

data/ext/num4diff/CNum4Diff.c

@@ -9,11 +9,15 @@ static double CNum4Diff_doRungeKuttaMethod(double yi, double xi, double h, 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 CNum4Diff _cNum4Diff = {
+    .tierMethod = {
 	.FP_eulerMethod          = CNum4Diff_doEulerMethod,
 	.FP_heunMethod           = CNum4Diff_doHeunMethod,
 	.FP_rungeKuttaMethod     = CNum4Diff_doRungeKuttaMethod,
+    },
+    .multistageMethod = {
 	.FP_adamsBashforthMethod = CNum4Diff_doAdamsBashforthMethod,
 	.FP_adamsMoultonMethod   = CNum4Diff_doAdamsMoultonMethod,
+    },
 };
 /**************************************/
 /* InterFface部                       */
@@ -21,37 +25,37 @@ static CNum4Diff _cNum4Diff = {
 /**************************************/
 /* Class部                            */
 /**************************************/
-double CNum4Diff_eulerMethod(double yi, double xi, double h, Func func)
+double CNum4Diff_Tier_eulerMethod(double yi, double xi, double h, Func func)
 {
     assert(func != 0);
 
-    return _cNum4Diff.FP_eulerMethod(yi, xi, h, func);
+    return _cNum4Diff.tierMethod.FP_eulerMethod(yi, xi, h, func);
 }
-double CNum4Diff_heunMethod(double yi, double xi, double h, Func func)
+double CNum4Diff_Tier_heunMethod(double yi, double xi, double h, Func func)
 {
     assert(func != 0);
 
-    return _cNum4Diff.FP_heunMethod(yi, xi, h, func);
+    return _cNum4Diff.tierMethod.FP_heunMethod(yi, xi, h, func);
 }
-double CNum4Diff_rungeKuttaMethod(double yi, double xi, double h, Func func)
+double CNum4Diff_Tier_rungeKuttaMethod(double yi, double xi, double h, Func func)
 {
     assert(func != 0);
 
-    return _cNum4Diff.FP_rungeKuttaMethod(yi, xi, h, func);
+    return _cNum4Diff.tierMethod.FP_rungeKuttaMethod(yi, xi, h, func);
 }
-double CNum4Diff_adamsBashforthMethod(double a, double b, double y0, double h, Func func)
+double CNum4Diff_Multistage_adamsBashforthMethod(double a, double b, double y0, double h, Func func)
 {
     assert(func != 0);
     assert(a < b);
 
-    return _cNum4Diff.FP_adamsBashforthMethod(a, b, y0, h, func);
+    return _cNum4Diff.multistageMethod.FP_adamsBashforthMethod(a, b, y0, h, func);
 }
-double CNum4Diff_adamsMoultonMethod(double a, double b, double y0, double h, Func func)
+double CNum4Diff_Multistage_adamsMoultonMethod(double a, double b, double y0, double h, Func func)
 {
     assert(func != 0);
     assert(a < b);
 
-    return _cNum4Diff.FP_adamsMoultonMethod(a, b, y0, h, func);
+    return _cNum4Diff.multistageMethod.FP_adamsMoultonMethod(a, b, y0, h, func);
 }
 /**************************************/
 /* 処理実行部                         */
@@ -109,10 +113,10 @@ static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double y0, do
 
     fi2  = y0;
     xi = xi + h;
-    fi1  = CNum4Diff_rungeKuttaMethod(fi2, xi, h, func);
+    fi1  = CNum4Diff_Tier_rungeKuttaMethod(fi2, xi, h, func);
     y = fi1;
     for (xi = xi + h; xi < b; xi += h) {
-        fi  = CNum4Diff_rungeKuttaMethod(fi1, xi, h, func);
+        fi  = CNum4Diff_Tier_rungeKuttaMethod(fi1, xi, h, func);
         y = y + h * (23 * fi - 16 * fi1 + 5 * fi2) / 12.0;
         fi2 = fi1;
         fi1 = fi;
@@ -133,10 +137,10 @@ static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double y0, doub
 
     fi2  = y0;
     xi = xi + h;
-    fi1  = CNum4Diff_rungeKuttaMethod(fi2, xi, h, func);
+    fi1  = CNum4Diff_Tier_rungeKuttaMethod(fi2, xi, h, func);
     y = fi1;
     for (xi = xi + h; xi < b; xi += h) {
-        fi  = CNum4Diff_rungeKuttaMethod(fi1, xi, h, func);
+        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;

data/ext/num4diff/CNum4Diff.h

@@ -4,27 +4,37 @@
 /**************************************/
 /* 構造体宣言                         */
 /**************************************/
-typedef struct _CNum4Diff CNum4Diff;
+typedef struct _CNum4Diff           CNum4Diff;
+typedef struct _CNum4DiffTier       CNum4DiffTier;
+typedef struct _CNum4DiffMultistage CNum4DiffMultistage;
 typedef double (*Func)(double x);
 
-struct _CNum4Diff
+struct _CNum4DiffTier
+{
+    double (*FP_eulerMethod)(double yi, double xi, double h, Func func);
+    double (*FP_heunMethod)(double yi, double xi, double h, Func func);
+    double (*FP_rungeKuttaMethod)(double yi, double xi, double h, Func func);
+};
+struct _CNum4DiffMultistage
 {
-	double (*FP_eulerMethod)(double yi, double xi, double h, Func func);
-	double (*FP_heunMethod)(double yi, double xi, double h, Func func);
-	double (*FP_rungeKuttaMethod)(double yi, double xi, double h, Func func);
 	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);
 ;
 };
+struct _CNum4Diff
+{
+    CNum4DiffTier tierMethod;
+    CNum4DiffMultistage multistageMethod;
+};
 /**************************************/
 /* define宣言                         */
 /**************************************/
 /**************************************/
 /* プロトタイプ宣言                   */
 /**************************************/
-double CNum4Diff_eulerMethod(double yi, double xi, double h, Func func);
-double CNum4Diff_heunMethod(double yi, double xi, double h, Func func);
-double CNum4Diff_rungeKuttaMethod(double yi, double xi, double h, Func func);
-double CNum4Diff_adamsBashforthMethod(double a, double b, double y0, double h, Func func);
-double CNum4Diff_adamsMoultonMethod(double a, double b, double y0, double h, Func func);
+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);
 #endif

data/lib/num4diff.rb

@@ -26,7 +26,7 @@ module Num4DiffLib
     #   @return [double] xi+hに対するyi_1の値
     #
     attach_function :eulerMethod,
-        :CNum4Diff_eulerMethod, [:double, :double, :double, :f], :double
+        :CNum4Diff_Tier_eulerMethod, [:double, :double, :double, :f], :double
     #
     # ホイン法による数値計算
     # @overload heunMethod(yi, xi, h, func)
@@ -38,7 +38,7 @@ module Num4DiffLib
     #   @return [double] xi+hに対するyi_1の値
     #
     attach_function :heunMethod,
-        :CNum4Diff_heunMethod, [:double, :double, :double, :f], :double
+        :CNum4Diff_Tier_heunMethod, [:double, :double, :double, :f], :double
     #
     # 4次のルンゲ＝クッタ法による数値計算
     # @overload  rungeKuttaMethod(yi, xi, h, func)
@@ -50,7 +50,7 @@ module Num4DiffLib
     #   @return [double] xi+hに対するyi_1の値
     #
     attach_function :rungeKuttaMethod,
-        :CNum4Diff_rungeKuttaMethod, [:double, :double, :double, :f], :double
+        :CNum4Diff_Tier_rungeKuttaMethod, [:double, :double, :double, :f], :double
     #
     # アダムス・バッシュフォース法(3段)による数値計算
     # @overload adamsBashforthMethod(a, b, y0, h, func)
@@ -62,7 +62,7 @@ module Num4DiffLib
     #   @return [double] [a,b]の積分値
     #
     attach_function :adamsBashforthMethod,
-        :CNum4Diff_adamsBashforthMethod, [:double, :double, :double, :double, :f], :double
+        :CNum4Diff_Multistage_adamsBashforthMethod, [:double, :double, :double, :double, :f], :double
     #
     # アダムス・ムルトン法(3段)による数値計算
     # @overload adamsMoultonMethod(a, b, y0, xi, h, func)
@@ -74,5 +74,5 @@ module Num4DiffLib
     #   @return [double] [a,b]の積分値
     #
     attach_function :adamsMoultonMethod,
-        :CNum4Diff_adamsMoultonMethod, [:double, :double, :double, :double, :f], :double
+        :CNum4Diff_Multistage_adamsMoultonMethod, [: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.5
+  version: 0.4.6
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-13 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -69,6 +69,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: http://github.com/siranovel/num4different/blob/main/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/num4diff/0.4.6
   homepage_uri: http://github.com/siranovel/num4different
 post_install_message: 
 rdoc_options: []