num4diff 0.4.1 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95791897f007359af4173789c870f3ffa8452f09fc017a536d48d37fcdc603da
-  data.tar.gz: 524fa90d4419c943c8a3299536d1cd01e1579dba2b40fa4f7f230cf1c9b3ebb0
+  metadata.gz: 459519c218ccc304f0c9faf97dc76448addcba5505e507a78d6a54544c95766c
+  data.tar.gz: 0727aba63582a07844f6fc3d8340cea6c51ed231e4829a41620be0946a502fff
 SHA512:
-  metadata.gz: 7e92082fecfcf942195fed655174f373b5c681bb8cb4db3824faca0a36a85df8cca4dd1eec0f4257c3139e210f81c9302673ff21447d96f5b5fdc5eab3469573
-  data.tar.gz: 2f900014fff30736796d7ae47ca4e83abe2e579ce0664879be88e70ff7ab890d4ac602881f9b2c04c5f3223000706ef1b75ac8d43caadd4bf15edcf86afd05fd
+  metadata.gz: 2b78c27839fc39912994c26f11cc1500afbdbb5239fa5cef3adcdc2eb801feb934d005ec25f8c8e5150a5a654b48083f66bc9ddcfe4af338fb7507d59d670013
+  data.tar.gz: 2a1c335d8f477688a96a05b1288546d6acea5694e7b3c3c29804c6eb91804db0e6c6bee3db26f01d2ea61e8afec8e208c30ace67059a077ac4edb584c51ad29e

data/CHANGELOG.md

@@ -0,0 +1,56 @@
+# Change Log
+
+## Unreleased
+
+## [0.4.4] - 2023-04-11
+
+### Added
+- Add CHANGELOG.md
+
+## [0.4.3] - 2023-04-10
+
+### Added 
+- Add function of adamsBashforthMethod アダムス・バッシュフォース法(3段)
+- Add function of adamsMoultonMethod   アダムス・ムルトン法(3段)
+
+## [0.4.1] - 2023-03-26
+
+### Fixed
+- Fix from add_runtime_dependency 'rake'
+        to add_development_dependency 'rake'
+
+## [0.3.14] - 2023-02-21
+
+### Added 
+- Add file of Gemfile.
+
+## [0.3.4] - 2023-02-18
+
+### Changed
+- @overload
+
+## [0.1.3] - 2022-04-15
+
+### Changed
+- fix from ffi to ffi-compiler
+
+## [0.0.22] - 2022-04-05
+
+### Added
+- Add yardoc
+
+## [0.0.20] - 2022-03-25
+
+### Added
+- Add file of LICENSE.
+
+### Changed
+- chg comment
+
+## [0.0.17] - 2022-03-23
+
+### Fixed
+- fix first fixed.
+
+
+

data/ext/num4diff/CNum4Diff.c

@@ -6,10 +6,14 @@
 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 CNum4Diff _cNum4Diff = {
-	.FP_eulerMethod = CNum4Diff_doEulerMethod,
-	.FP_heunMethod = CNum4Diff_doHeunMethod,
-	.FP_rungeKuttaMethod = CNum4Diff_doRungeKuttaMethod,
+	.FP_eulerMethod          = CNum4Diff_doEulerMethod,
+	.FP_heunMethod           = CNum4Diff_doHeunMethod,
+	.FP_rungeKuttaMethod     = CNum4Diff_doRungeKuttaMethod,
+	.FP_adamsBashforthMethod = CNum4Diff_doAdamsBashforthMethod,
+	.FP_adamsMoultonMethod   = CNum4Diff_doAdamsMoultonMethod,
 };
 /**************************************/
 /* InterFface部                       */
@@ -35,6 +39,20 @@ double CNum4Diff_rungeKuttaMethod(double yi, double xi, double h, Func func)
 
     return _cNum4Diff.FP_rungeKuttaMethod(yi, xi, h, func);
 }
+double CNum4Diff_adamsBashforthMethod(double a, double b, double yi, double h, Func func)
+{
+    assert(func != 0);
+    assert(a < b);
+
+    return _cNum4Diff.FP_adamsBashforthMethod(a, b, yi, h, func);
+}
+double CNum4Diff_adamsMoultonMethod(double a, double b, double yi, double h, Func func)
+{
+    assert(func != 0);
+    assert(a < b);
+
+    return _cNum4Diff.FP_adamsMoultonMethod(a, b, yi, h, func);
+}
 /**************************************/
 /* 処理実行部                         */
 /**************************************/
@@ -57,7 +75,7 @@ static double CNum4Diff_doHeunMethod(double yi, double xi, double h, Func func)
     double k2 = 0.0;
 
     k1 = h * y;                        // k1 = h * f(xi, y)
-    k2 = h * (yi + k1);                // k2 = h * f(xi_h, h * f(xi + h, yi + k1)
+    k2 = h * (yi + k1);                // k2 = h * f(xi + h, h * f(xi + h, yi + k1)
     return yi + (k1 + k2) / 2.0;
 }
 /*
@@ -78,4 +96,50 @@ static double CNum4Diff_doRungeKuttaMethod(double yi, double xi, double h, Func
     k4 = h * (yi + k3);                // k4 = h * f(xi + h, yi + k3)
     return yi + (k1 + 2 * k2 + 2 * k3 + k4) / 6.0; 
 }
+/*
+ * アダムス・バッシュフォース法(3段)
+ */
+static double CNum4Diff_doAdamsBashforthMethod(double a, double b, double yi, double h, Func func)
+{
+    double xi = a;
+    double fi;
+    double fi1 = 0;
+    double fi2 = 0;
+    double y = yi;
+
+    fi2  = yi;
+    xi = xi + h;
+    fi1  = CNum4Diff_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 * (23 * fi - 16 * fi1 + 5 * fi2) / 12.0;
+        fi2 = fi1;
+        fi1 = fi;
+    }
+    return y;
+}
+/*
+ * アダムス・ムルトン法(3段)
+ */
+static double CNum4Diff_doAdamsMoultonMethod(double a, double b, double yi, double h, Func func)
+{
+    double xi = a;
+    double fi;
+    double fi1 = 0;
+    double fi2 = 0;
+    double y = yi;
+
+    fi2  = CNum4Diff_rungeKuttaMethod(yi, xi, h, func);
+    xi = xi + h;
+    fi1  = CNum4Diff_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;
+        fi2 = fi1;
+        fi1 = fi;
+    }
+    return y;
+}
 

data/ext/num4diff/CNum4Diff.h

@@ -12,6 +12,9 @@ struct _CNum4Diff
 	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);
+;
 };
 /**************************************/
 /* define宣言                         */
@@ -22,4 +25,6 @@ struct _CNum4Diff
 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);
 #endif

data/lib/num4diff.rb

@@ -9,40 +9,70 @@ module Num4DiffLib
 
     ffi_lib FFI::Compiler::Loader.find('num4diff') 
     # @overload f(xi)
-    #   @param [double] xi xiの値
+    #   dy = f(xi)
+    #   @yield [x] dy = f(x)
+    #   @yieldparam [double] xi xiの値
     #   @return [double] xiに対するyの値
     callback   :f, [:double], :double
 
     #
-    # @overload  eulerMethod(yi, xi, h, func)
-    #   オイラー法による数値計算
+    # オイラー法による数値計算
+    # @overload eulerMethod(yi, xi, h, func)
+    #   yi_1 = eulerMethod(yi, xi, h, func)
     #   @param [double] yi xiに対するyiの値
     #   @param [double] xi xiの値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
-    #   @return [double] xi+hに対するyiの値
+    #   @return [double] xi+hに対するyi_1の値
     #
     attach_function :eulerMethod,
         :CNum4Diff_eulerMethod, [:double, :double, :double, :f], :double
+    #
+    # ホイン法による数値計算
     # @overload heunMethod(yi, xi, h, func)
-    #   ホイン法による数値計算
+    #   yi_1 = heunMethod(yi, xi, h, func)
     #   @param [double] yi xiに対するyiの値
     #   @param [double] xi xiの値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
-    #   @return [double] xi+hに対するyiの値
+    #   @return [double] xi+hに対するyi_1の値
     #
     attach_function :heunMethod,
         :CNum4Diff_heunMethod, [:double, :double, :double, :f], :double
     #
-    # @overload rungeKuttaMethod(yi, xi, h, func)
-    #   4次のルンゲ＝クッタ法による数値計算
+    # 4次のルンゲ＝クッタ法による数値計算
+    # @overload  rungeKuttaMethod(yi, xi, h, func)
+    #   yi_1 = rungeKuttaMethod(yi, xi, h, func)
     #   @param [double] yi xiに対するyiの値
     #   @param [double] xi xiの値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
-    #   @return [double] xi+hに対するyiの値
+    #   @return [double] xi+hに対するyi_1の値
     #
     attach_function :rungeKuttaMethod,
         :CNum4Diff_rungeKuttaMethod, [:double, :double, :double, :f], :double
+    #
+    # アダムス・バッシュフォース法(3段)による数値計算
+    # @overload adamsBashforthMethod(a, b, yi, h, func)
+    #   @param [double] a 下限値
+    #   @param [double] b 上限値
+    #   @param [double] yi xiに対するyiの値
+    #   @param [double] h  刻み幅
+    #   @param [callback] func xiに対する傾きを計算する関数
+    #   @return [double] xi+hに対するyi_1の値
+    #
+    attach_function :adamsBashforthMethod,
+        :CNum4Diff_adamsBashforthMethod, [:double, :double, :double, :double, :f], :double
+    #
+    # アダムス・ムルトン法(3段)による数値計算
+    # @overload adamsMoultonMethod(a, b, yi, xi, h, func)
+    #   @param [double] a 下限値
+    #   @param [double] b 上限値
+    #   @param [double] yi xiに対するyiの値
+    #   @param [double] h  刻み幅
+    #   @param [callback] func xiに対する傾きを計算する関数
+    #   @return [double] xi+hに対するyi_1の値
+    #
+    attach_function :adamsMoultonMethod,
+        :CNum4Diff_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.1
+  version: 0.4.4
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-26 00:00:00.000000000 Z
+date: 2023-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -57,6 +57,7 @@ extensions:
 - ext/num4diff/Rakefile
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - ext/num4diff/CNum4Diff.c
@@ -66,7 +67,8 @@ files:
 homepage: http://github.com/siranovel/num4different
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: http://github.com/siranovel/num4different/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: