num4inte 0.0.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 391c7af590564ae676a706c71d1c3d67ba1d8f3c3d01cece8bc5b298d13de1c9
-  data.tar.gz: fae05e502bb9acc4a4456fb285a9cae64d43d895e8822e21b68a7b7b31be7bdd
+  metadata.gz: 1f3bd51f9372806b1b4251367e31852d5fa1ceab2a154b96481d8c193867e1ba
+  data.tar.gz: 0b40e2490195c0b39c71fd39d64c6c63f375ffc585376dc2727255d0297accc5
 SHA512:
-  metadata.gz: 19add3204882ae70fe3173567f13e1f268da893df1a46f73dd58833191f5ec194d9200cc4769527a4a74995f5a0257a794acf4c1b27692e31763c5254ff4240d
-  data.tar.gz: 9d81760ab9526a4ddc621ba374f1e30ae35d339903f9c301e3aee15bf64b857768044d74f09893011f11e81c38b526fd6f9fe75356475372bcd10f843abd0799
+  metadata.gz: 983873e08341371a05526319aaede30562dac9c1a3ba29ea42538aedfdffd4c2f00300df688c745fb971bee89172ea22d56832fd343d44167ba751a9acb6d3f0
+  data.tar.gz: cf9f75b196b7c711084b63d0fad68ade85866073c609ca6c8cfe50b68d137c2dc8af43c4d4aca6b2db52ce331a172b2859644c958c2570277fbdf9bd1e021a1a

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## [0.1.2] - 2023-05-24
+
+### Added
+- add function of gaussLegendreRule.
+
+## [0.1.1] - 2023-04-27
+
+### Added
+- add function of simpsonRule.
+- add assert(a < b);
+
+### Fixed
+- change from leftReimannSumMetod to leftReimannSumMethod.
+- change from rigtReimannSumMetod to rigtReimannSumMethod.
+- change from newtonMetod to trapezioidalRule.
+
 ## [0.0.1] - 2023-04-25
 
 ### Fixed

data/ext/num4inte/CNum4Inte.c

@@ -3,13 +3,50 @@
 #include <assert.h>
 #include "CNum4Inte.h"
 
-static double CNum4Inte_doLeftReimannSumMetod(double a, double b, double h, Func func);
+static double CNum4Inte_doLeftReimannSumMethod(double a, double b, double h, Func func);
 static double CNum4Inte_doRigtReimannSumMetod(double a, double b, double h, Func func);
-static double CNum4Inte_doNewtonMethod(double a, double b, double h, Func func);
+static double CNum4Inte_doTrapezioidalRule(double a, double b, double h, Func func);
+static double CNum4Inte_doSimpsonRule(double a, double b, double h, Func func);
+static double CNum4Inte_doGaussLegendreRule(int n, double a, double b, double h, Func func);
 static CNum4Inte _cNum4Inte = {
-    .FP_leftReimannSumMetod = CNum4Inte_doLeftReimannSumMetod,
-    .FP_rigtReimannSumMetod = CNum4Inte_doRigtReimannSumMetod,
-    .FP_newtonMethod        = CNum4Inte_doNewtonMethod,
+    .reimann = {
+        .FP_leftReimannSumMethod = CNum4Inte_doLeftReimannSumMethod,
+        .FP_rigtReimannSumMethod = CNum4Inte_doRigtReimannSumMetod,
+    },
+    .newton = {
+        .FP_trapezioidalRule     = CNum4Inte_doTrapezioidalRule,
+        .FP_simpsonRule          = CNum4Inte_doSimpsonRule,
+    },
+    .gauss = {
+        .FP_gaussLegendreRule    = CNum4Inte_doGaussLegendreRule,
+    },
+};
+// ガウス・テーブル
+// n = 1 
+//   xi = 0                                  wi = 2
+// n = 2 
+//   xi = ±1/sqrt(3)=0.577350               wi = 1
+// n = 3
+//   xi = 0                                  wi = 8/9
+//   xi = ±sqrt(3/5)=0.774597               wi = 5/9
+// n = 4
+//   xi = ±sqrt(3/7-2/7sqrt(6/5))=0.339981  wi = (18+sqrt(30))/36=0.652145
+//   xi = ±sqrt(3/7+2/7sqrt(6/5))=0.861136  wi = (18-sqrt(30))/36=0.347855
+// n = 5
+//   xi = 0                                  wi = 128/225
+//   xi = 1/3*sqrt(5-2sqrt(10/7))=0.538469   wi = (322+13sqrt(70))/900:0.478629
+//   xi = 1/3*sqrt(5+2sqrt(10/7))=0.906180   wi = (322-13sqrt(70))/900:0.236927
+static GaussTbl gaussTbl[] = {
+    [0] = {.xi = {[0] = 0.0},
+           .wi = {[0] = 2.0}},
+    [1] = {.xi = {[0] = -0.577350, [1] = 0.577350},
+           .wi = {[0] = 1.0, [1] = 1.0}},
+    [2] = {.xi = {[0] = 0.0, [1] = -0.774597, [2] = 0.774597},
+           .wi = {[0] = 0.888889, [1] = 0.555556, [2] = 0.555556}},
+    [3] = {.xi = {[0] = -0.339981, [1] = 0.339981, [2] = -0.861136, [3] = 0.861136},
+           .wi = {[0] = 0.652145, [1] = 0.652145, [2] = 0.347855, [3] = 0.347855}},
+    [4] = {.xi = {[0] = 0.0, [1] = -0.538469, [2] = 0.538469, [3] = -0.906180, [4] = 0.906180},
+           .wi = {[0] = 0.568889, [1] = 0.478629, [2] = 0.478629, [3] = 0.236927, [4] = 0.236927}},
 };
 /**************************************/
 /* InterFface部                       */
@@ -17,23 +54,41 @@ static CNum4Inte _cNum4Inte = {
 /**************************************/
 /* Class部                            */
 /**************************************/
-double CNum4Inte_leftReimannSumMetod(double a, double b, double h, Func func)
+double CNum4Inte_reimann_leftReimannSumMethod(double a, double b, double h, Func func)
+{
+    assert(func != 0);
+    assert(a < b);
+
+    return _cNum4Inte.reimann.FP_leftReimannSumMethod(a, b, h, func);
+}
+double CNum4Inte_reimann_rigtReimannSumMethod(double a, double b, double h, Func func)
+{
+    assert(func != 0);
+    assert(a < b);
+
+    return _cNum4Inte.reimann.FP_rigtReimannSumMethod(a, b, h, func);
+}
+double CNum4Inte_rewton_trapezioidalRule(double a, double b, double h, Func func)
 {
     assert(func != 0);
+    assert(a < b);
 
-    return _cNum4Inte.FP_leftReimannSumMetod(a, b, h, func);
+    return _cNum4Inte.newton.FP_trapezioidalRule(a, b, h, func);
 }
-double CNum4Inte_rigtReimannSumMetod(double a, double b, double h, Func func)
+double CNum4Inte_rewton_simpsonRule(double a, double b, double h, Func func)
 {
     assert(func != 0);
+    assert(a < b);
 
-    return _cNum4Inte.FP_rigtReimannSumMetod(a, b, h, func);
+    return _cNum4Inte.newton.FP_simpsonRule(a, b, h, func);
 }
-double CNum4Inte_newtonMethod(double a, double b, double h, Func func)
+double CNum4Inte_gauss_gaussLegendreRule(int n, double a, double b, double h, Func func)
 {
     assert(func != 0);
+    assert(a < b);
+    assert((1 <= n) && (n <= 5));
 
-    return _cNum4Inte.FP_newtonMethod(a, b, h, func);
+    return _cNum4Inte.gauss.FP_gaussLegendreRule(n, a, b, h, func);
 }
 /**************************************/
 /* 処理実行部                          */
@@ -41,10 +96,10 @@ double CNum4Inte_newtonMethod(double a, double b, double h, Func func)
 /*
  * 左リーマン和法
  */
-static double CNum4Inte_doLeftReimannSumMetod(double a, double b, double h, Func func)
+static double CNum4Inte_doLeftReimannSumMethod(double a, double b, double h, Func func)
 {
     double rimann = 0.0;
-    double x = 0.0;
+    double x;
 
     for (x = a; x < b; x += h) {
         rimann += func(x);
@@ -57,7 +112,7 @@ static double CNum4Inte_doLeftReimannSumMetod(double a, double b, double h, Func
 static double CNum4Inte_doRigtReimannSumMetod(double a, double b, double h, Func func)
 {
     double rimann = 0.0;
-    double x = 0.0;
+    double x;
 
     for (x = a; x < b; x += h) {
         rimann += func(x + h);
@@ -65,21 +120,66 @@ static double CNum4Inte_doRigtReimannSumMetod(double a, double b, double h, Func
     return rimann * h;
 }
 /*
- * ニュートン・シンプソン法
+ * 台形公式
  */
-static double CNum4Inte_doNewtonMethod(double a, double b, double h, Func func)
+static double CNum4Inte_doTrapezioidalRule(double a, double b, double h, Func func)
 {
-    double newton = 0.0;
-    double x = 0.0;
+    double trapezoidal = 0.0;
     double fx = func(a);
     double fxh = 0.0;
+    double x;
 
     for (x = a; x < b; x += h) {
         fxh = func(x + h);
-        newton += (fx + fxh) /2;
+        trapezoidal += (fx + fxh);
         fx = fxh;
     }    
-    return newton * h;
+    return trapezoidal * h / 2.0;
+}
+/*
+ * シンプソンの公式
+ */
+static double CNum4Inte_doSimpsonRule(double a, double b, double h, Func func)
+{
+    double simpson = 0.0;
+    double fx = func(a);
+    double fxh = 0.0;
+    double h2 = h / 2.0;
+    double x;
+
+    for (x = a; x < b; x += h) {
+        double fxh2 = func(x + h2);
+        double fxh  = func(x + h);
+
+        simpson += (fx + fxh + 4 * fxh2);
+        fx = fxh2;
+    }
+    return simpson * h / 6.0;
+
+}
+/*
+ * ガウス・ルジャンドルの公式
+ */
+static double CNum4Inte_doGaussLegendreRule(int n, double a, double b, double h, Func func)
+{
+    double x;
+    double gauss = 0.0;
+    GaussTbl *pt = &gaussTbl[n - 1];
+
+    for (x = a; x < b; x += h) {
+        int i;
+        double xa = x;
+        double xb = x + h;
+        double bMa = (xb - xa) / 2.0;
+        double aPb = (xa + xb) / 2.0;
+        double wifi = 0.0;
+             
+        for (i = 0; i < n; i++) {
+            wifi +=  pt->wi[i] * func(bMa * pt->xi[i] + aPb);
+        }
+        gauss += bMa * wifi;
+    }
+    return gauss;
 }
 
 

data/ext/num4inte/CNum4Inte.h

@@ -5,21 +5,46 @@
 /* 構造体宣言                         */
 /**************************************/
 typedef struct _CNum4Inte CNum4Inte;
+typedef struct _CReimann  CReimann;
+typedef struct _CNewton   CNewton;
+typedef struct _CGauss    CGauss;
 typedef double (*Func)(double x);
+typedef struct _GaussTbl  GaussTbl;
 
+struct _CReimann
+{
+    double (*FP_leftReimannSumMethod)(double a, double b, double h, Func func);
+    double (*FP_rigtReimannSumMethod)(double a, double b, double h, Func func);
+};
+struct _CNewton
+{
+    double (*FP_trapezioidalRule)(double a, double b, double h, Func func);
+    double (*FP_simpsonRule)(double a, double b, double h, Func func);
+};
+struct _CGauss
+{
+    double (*FP_gaussLegendreRule)(int n, double a, double b, double h, Func func);
+};
 struct _CNum4Inte
 {
-    double (*FP_leftReimannSumMetod)(double a, double b, double h, Func func);
-    double (*FP_rigtReimannSumMetod)(double a, double b, double h, Func func);
-    double (*FP_newtonMethod)(double a, double b, double h, Func func);
+    CReimann reimann;
+    CNewton  newton;
+    CGauss   gauss;
+};
+struct _GaussTbl
+{
+    double xi[5];
+    double wi[5];
 };
 /**************************************/
 /* define宣言                         */
 /**************************************/
 /**************************************/
-/* プロトタイプ宣言                   */
+/* プロトタイプ宣言                    */
 /**************************************/
-double CNum4Inte_leftReimannSumMetod(double a, double b, double h, Func func);
-double CNum4Inte_rigtReimannSumMetod(double a, double b, double h, Func func);
-double CNum4Inte_newtonMethod(double a, double b, double h, Func func);
+double CNum4Inte_reimann_leftReimannSumMethod(double a, double b, double h, Func func);
+double CNum4Inte_reimann_rigtReimannSumMethod(double a, double b, double h, Func func);
+double CNum4Inte_rewton_trapezioidalRule(double a, double b, double h, Func func);
+double CNum4Inte_rewton_simpsonRule(double a, double b, double h, Func func);
+double CNum4Inte_gauss_gaussLegendreRule(int n, double a, double b, double h, Func func);
 #endif

data/ext/num4inte/Rakefile

@@ -1,5 +1,5 @@
 require 'ffi-compiler/compile_task'
 
 FFI::Compiler::CompileTask.new('num4inte') do |c|
-  c.have_header?('CNum4Inte', '.')
+  c.have_header?('CNum4Inte.h', '.')
 end

data/lib/num4inte.rb

@@ -17,39 +17,63 @@ module Num4InteLib
 
     #
     # 左リーマン和法
-    # @overload leftReimannSumMetod(a, b, h, func)
-    #   y = leftReimannSumMetod(a, b, h, func)
+    # @overload leftReimannSumMethod(a, b, h, func)
+    #   y = leftReimannSumMethod(a, b, h, func)
     #   @param [double] a aの値
     #   @param [double] b bの値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
     #   @return [double] [a,b]の間の積分値
     #
-    attach_function :leftReimannSumMetod,
-        :CNum4Inte_leftReimannSumMetod, [:double, :double, :double, :f], :double
+    attach_function :leftReimannSumMethod,
+        :CNum4Inte_reimann_leftReimannSumMethod, [:double, :double, :double, :f], :double
     #
     # 右リーマン和法
-    # @overload rigtReimannSumMetod(a, b, h, func)
-    #   y = rigtReimannSumMetod(a, b, h, func)
+    # @overload rigtReimannSumMethod(a, b, h, func)
+    #   y = rigtReimannSumMethod(a, b, h, func)
     #   @param [double] a aの値
     #   @param [double] b bの値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
     #   @return [double] [a,b]の間の積分値
     #
-    attach_function :rigtReimannSumMetod,
-        :CNum4Inte_rigtReimannSumMetod, [:double, :double, :double, :f], :double
+    attach_function :rigtReimannSumMethod,
+        :CNum4Inte_reimann_rigtReimannSumMethod, [:double, :double, :double, :f], :double
     #
-    # ニュートン・シンプソン法
-    # @overload newtonMethod(a, b, h, func)
-    #   y = newtonMethod(a, b, h, func)
+    # ニュートン・コーツ法(1次:台形公式)
+    # @overload trapezioidalRule(a, b, h, func)
+    #   y = trapezioidalRule(a, b, h, func)
     #   @param [double] a aの値
     #   @param [double] b bの値
     #   @param [double] h  刻み幅
     #   @param [callback] func xiに対する傾きを計算する関数
     #   @return [double] [a,b]の間の積分値
     #
-    attach_function :newtonMethod,
-        :CNum4Inte_newtonMethod, [:double, :double, :double, :f], :double
+    attach_function :trapezioidalRule,
+        :CNum4Inte_rewton_trapezioidalRule, [:double, :double, :double, :f], :double
+    #
+    # ニュートン・コーツ法(2次:シンプソンの公式)
+    # @overload simpsonRule(a, b, h, func)
+    #   y = simpsonRule(a, b, h, func)
+    #   @param [double] a aの値
+    #   @param [double] b bの値
+    #   @param [double] h  刻み幅
+    #   @param [callback] func xiに対する傾きを計算する関数
+    #   @return [double] [a,b]の間の積分値
+    #
+    attach_function :simpsonRule,
+        :CNum4Inte_rewton_simpsonRule, [:double, :double, :double, :f], :double
+    #
+    # ガウス求積法
+    # @overload gaussLegendreRule(n, a, b, h, func)
+    #   y = gaussLegendreRule(n, a, b, h, func)
+    #   @param [int]    n 分割数
+    #   @param [double] a aの値
+    #   @param [double] b bの値
+    #   @param [double] h  刻み幅
+    #   @param [callback] func xiに対する傾きを計算する関数
+    #   @return [double] [a,b]の間の積分値
+    attach_function :gaussLegendreRule,
+        :CNum4Inte_gauss_gaussLegendreRule, [:int, :double, :double, :double, :f], :double
 end
 

metadata

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