num4diff 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 459519c218ccc304f0c9faf97dc76448addcba5505e507a78d6a54544c95766c
-  data.tar.gz: 0727aba63582a07844f6fc3d8340cea6c51ed231e4829a41620be0946a502fff
+  metadata.gz: fc6954bb9f3eb7e7b35429c7f4429aa60f5a998ce1934dbe79b0117ae1013a51
+  data.tar.gz: 3caa0e4e7b083a435b374c0739134ac583ab149f30306327783cf239896c263b
 SHA512:
-  metadata.gz: 2b78c27839fc39912994c26f11cc1500afbdbb5239fa5cef3adcdc2eb801feb934d005ec25f8c8e5150a5a654b48083f66bc9ddcfe4af338fb7507d59d670013
-  data.tar.gz: 2a1c335d8f477688a96a05b1288546d6acea5694e7b3c3c29804c6eb91804db0e6c6bee3db26f01d2ea61e8afec8e208c30ace67059a077ac4edb584c51ad29e
+  metadata.gz: b9e5780c5bbfecb0dd284e561775f78a8cff1530194817f4ac58f22db6f0103e851558a548e3cf04d54e4f4d009a2cad2508d1f5bb6a2e2cf33f8aa59a50174e
+  data.tar.gz: 2d4736748fa20f35f7ba11fa0e614f165d9b30a73038d4942262c30f3951d33db45bf0ffb46970197b45e3d98e51d639365a3845e69a8ebc52c4db309be9569b

data/CHANGELOG.md

@@ -2,10 +2,16 @@
 
 ## Unreleased
 
+## [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 +22,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,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 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 = {
 	.FP_eulerMethod          = CNum4Diff_doEulerMethod,
 	.FP_heunMethod           = CNum4Diff_doHeunMethod,
@@ -39,19 +39,19 @@ 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)
+double CNum4Diff_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.FP_adamsBashforthMethod(a, b, y0, h, func);
 }
-double CNum4Diff_adamsMoultonMethod(double a, double b, double yi, double h, Func func)
+double CNum4Diff_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.FP_adamsMoultonMethod(a, b, y0, h, func);
 }
 /**************************************/
 /* 処理実行部                         */
@@ -99,15 +99,15 @@ 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);
     y = fi1;
@@ -122,21 +122,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);
     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;
+        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

@@ -12,8 +12,8 @@ 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);
+	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);
 ;
 };
 /**************************************/
@@ -25,6 +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);
+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);
 #endif

data/lib/num4diff.rb

@@ -53,25 +53,25 @@ module Num4DiffLib
         :CNum4Diff_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
     #
     # アダムス・ムルトン法(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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4diff
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
@@ -68,7 +68,8 @@ 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
+  homepage_uri: http://github.com/siranovel/num4different
 post_install_message: 
 rdoc_options: []
 require_paths: