num4diff 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459519c218ccc304f0c9faf97dc76448addcba5505e507a78d6a54544c95766c
-  data.tar.gz: 0727aba63582a07844f6fc3d8340cea6c51ed231e4829a41620be0946a502fff
+  metadata.gz: ff5e1dfd13b71508a48cf82c7e4cfdb28f83971c410a4d33aeabf2807c840b04
+  data.tar.gz: 67d9c83ef8cef833b636aedd31c0f686d0066272560c670159fef169e91aca4a
 SHA512:
-  metadata.gz: 2b78c27839fc39912994c26f11cc1500afbdbb5239fa5cef3adcdc2eb801feb934d005ec25f8c8e5150a5a654b48083f66bc9ddcfe4af338fb7507d59d670013
-  data.tar.gz: 2a1c335d8f477688a96a05b1288546d6acea5694e7b3c3c29804c6eb91804db0e6c6bee3db26f01d2ea61e8afec8e208c30ace67059a077ac4edb584c51ad29e
+  metadata.gz: f2a668107ed2dbe416f00a1a16ef6eda01832894fe5c2b8153efb948b440fa591d9ef4d33b0187da7e6fcf73dadb306c3c3b6f15f4f372cfd6a91b204e6bceae
+  data.tar.gz: ed3e97fa67b1dc82dc409a3ed8c4a2606c6f08a6a12d5c1d690e144c3fb31d98c245decb48284abdedc3e8a56e624ef68a8b44dcaa78a88a242d9f8d57421cbe

data/CHANGELOG.md

@@ -2,10 +2,21 @@
 
 ## Unreleased
 
+## [0.4.5] - 2023-04-24
+
+### Fixed
+- Fix Split into single-step and multi-step solutions.
+
+## [0.4.5] - 2023-04-14
+
+### Fixed
+- Fix function of adamsBashforthMethod
+- Fix function of adamsMoultonMethod
+
 ## [0.4.4] - 2023-04-11
 
 ### Added
-- Add CHANGELOG.md
+- Add file of CHANGELOG.md
 
 ## [0.4.3] - 2023-04-10
 
@@ -16,8 +27,8 @@
 ## [0.4.1] - 2023-03-26
 
 ### Fixed
-- Fix from add_runtime_dependency 'rake'
-        to add_development_dependency 'rake'
+- Fix from add_runtime_dependency 'ffi-compiler'
+        to add_development_dependency 'ffi-compiler'
 
 ## [0.3.14] - 2023-02-21
 

data/ext/num4diff/CNum4Diff.c

@@ -6,14 +6,18 @@
 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 yi, double h, Func func);
-static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double yi, 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 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 yi, 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, yi, h, func);
+    return _cNum4Diff.multistageMethod.FP_adamsBashforthMethod(a, b, y0, h, func);
 }
-double CNum4Diff_adamsMoultonMethod(double a, double b, double yi, 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, yi, h, func);
+    return _cNum4Diff.multistageMethod.FP_adamsMoultonMethod(a, b, y0, h, func);
 }
 /**************************************/
 /* 処理実行部                         */
@@ -99,20 +103,20 @@ static double CNum4Diff_doRungeKuttaMethod(double yi, double xi, double h, Func
 /*
  * アダムス・バッシュフォース法(3段)
  */
-static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double yi, double h, Func func)
+static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double y0, double h, Func func)
 {
     double xi = a;
     double fi;
     double fi1 = 0;
     double fi2 = 0;
-    double y = yi;
+    double y = 0.0;
 
-    fi2  = yi;
+    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;
@@ -122,21 +126,23 @@ static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double yi, do
 /*
  * アダムス・ムルトン法(3段)
  */
-static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double yi, double h, Func func)
+static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double y0, double h, Func func)
 {
     double xi = a;
     double fi;
     double fi1 = 0;
     double fi2 = 0;
-    double y = yi;
+    double y_pred = 0.0;
+    double y = 0.0;
 
-    fi2  = CNum4Diff_rungeKuttaMethod(yi, xi, h, func);
+    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);
-        y = y + h * (5 * fi + 8 * fi1 -1 * fi2) / 12.0;
+        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;
     }

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 yi, double h, Func func);
-	double (*FP_adamsMoultonMethod)(double a, double b, double yi, 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 yi, double h, Func func);
-double CNum4Diff_adamsMoultonMethod(double a, double b, double yi, 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,29 +50,29 @@ 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, yi, h, func)
+    # @overload adamsBashforthMethod(a, b, y0, h, func)
     #   @param [double] a 下限値
     #   @param [double] b 上限値
-    #   @param [double] yi xiに対するyiの値
+    #   @param [double] y0 y(x0=a)の値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
-    #   @return [double] xi+hに対するyi_1の値
+    #   @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, yi, xi, h, func)
+    # @overload adamsMoultonMethod(a, b, y0, xi, h, func)
     #   @param [double] a 下限値
     #   @param [double] b 上限値
-    #   @param [double] yi xiに対するyiの値
+    #   @param [double] y0 y0 y(x0=a)の値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
-    #   @return [double] xi+hに対するyi_1の値
+    #   @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.4
+  version: 0.4.6
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -68,7 +68,9 @@ homepage: http://github.com/siranovel/num4different
 licenses:
 - MIT
 metadata:
-  changelog_uri: http://github.com/siranovel/num4different/blob/master/CHANGELOG.md
+  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: []
 require_paths: