num4diff 0.0.22 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11beab66abec9bf696ee9b5c236dd40e78c5b98d79eea57839149153c01829b9
-  data.tar.gz: 8389c5b61a387a0eef3cfa7fe251743a25028ba937d74eabf6bd6ab53d81e7d0
+  metadata.gz: 0d3136cc91be5e19847b49e534e7fb8292c8e8d6e2e6ea7b64c19a8e4f0f5e87
+  data.tar.gz: 5687b8ae545c9df2da7b39fa2ebe6ae6017276edd8d1e5be750c583d7809c5ff
 SHA512:
-  metadata.gz: 47df3270e03fd56b3ff55ac29ddcd5b0ed8a1a9d48d2ff113c3bf6081966cbf266fb649f0246fabd3b851dd3db5a80adcd5695702e3f2d4cfad3b84314326c1d
-  data.tar.gz: df43a0e2609a1d6b8d5f545d38316805bdfb9f006cdf29c8e41c9619f58fe9ef3435ea8d28866c334084a639ca7ec67e10a7d846ae5511358c7544825710684d
+  metadata.gz: 1707e0ebc7e844bc39c64baff378a57ed2cffe80ad7ff3b1ebe51b9d6a2095b31b6018996cb8179ce298b4d7c7c04da5b758dcb896279db8b6703e4c5a3e189e
+  data.tar.gz: b9a91f1ebeccff6370a47204ec5de6b2a3e2b42e08934e609f512b313aeff78e53658d5b511585bb87ac82d6ecaced36e463446b70fdbf36efa92122607b437a

data/ext/num4diff/CNum4Diff.c

@@ -0,0 +1,81 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include "CNum4Diff.h"
+
+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 CNum4Diff _cNum4Diff = {
+	.FP_eulerMethod = CNum4Diff_doEulerMethod,
+	.FP_heunMethod = CNum4Diff_doHeunMethod,
+	.FP_rungeKuttaMethod = CNum4Diff_doRungeKuttaMethod,
+};
+/**************************************/
+/* InterFface部                       */
+/**************************************/
+/**************************************/
+/* Class部                            */
+/**************************************/
+double CNum4Diff_eulerMethod(double yi, double xi, double h, Func func)
+{
+    assert(func != 0);
+
+    return _cNum4Diff.FP_eulerMethod(yi, xi, h, func);
+}
+double CNum4Diff_heunMethod(double yi, double xi, double h, Func func)
+{
+    assert(func != 0);
+
+    return _cNum4Diff.FP_heunMethod(yi, xi, h, func);
+}
+double CNum4Diff_rungeKuttaMethod(double yi, double xi, double h, Func func)
+{
+    assert(func != 0);
+
+    return _cNum4Diff.FP_rungeKuttaMethod(yi, xi, h, func);
+}
+/**************************************/
+/* 処理実行部                         */
+/**************************************/
+/* 
+ * オイラー法
+ */
+static double CNum4Diff_doEulerMethod(double yi, double xi, double h, Func func)
+{
+    double y = func(xi);
+
+    return yi + h * y;
+}
+/*
+ * ホイン法
+ */
+static double CNum4Diff_doHeunMethod(double yi, double xi, double h, Func func)
+{
+    double y = func(xi);
+    double k1 = 0.0;
+    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)
+    return yi + (k1 + k2) / 2.0;
+}
+/*
+ * ルンゲクッタ法
+ */
+static double CNum4Diff_doRungeKuttaMethod(double yi, double xi, double h, Func func)
+{
+    double y = 0.0;
+    double k1 = 0.0;
+    double k2 = 0.0;
+    double k3 = 0.0;
+    double k4 = 0.0;
+
+    y = func(xi);
+    k1 = h * y;                        // k1 = h * f(xi, y)
+    k2 = h * (yi + k1 / 2.0);          // k2 = h * f(xi + h / 2, yi + k1 / 2) 
+    k3 = h * (yi + k2 / 2.0);          // k3 = h * f(xi + h / 2, y1 + k2 / 2)
+    k4 = h * (yi + k3);                // k4 = h * f(xi + h, yi + k3)
+    return yi + (k1 + 2 * k2 + 2 * k3 + k4) / 6.0; 
+}
+

data/ext/num4diff/CNum4Diff.h

@@ -0,0 +1,25 @@
+#ifndef _CNum4Diff_H_
+#define _CNum4Diff_H_
+
+/**************************************/
+/* 構造体宣言                         */
+/**************************************/
+typedef struct _CNum4Diff CNum4Diff;
+typedef double (*Func)(double x);
+
+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);
+};
+/**************************************/
+/* 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);
+#endif

data/ext/num4diff/Rakefile

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

data/lib/num4diff.rb

@@ -1,16 +1,16 @@
 require 'ffi'
+require 'ffi-compiler/loader'
 
 #
 # 数値計算による常微分方程式の解法するライブラリ
 #
 module Num4DiffLib
     extend FFI::Library
-    spec = Gem.loaded_specs["num4diff"]
-    gem_root = spec.gem_dir
-    ffi_lib ["#{gem_root}/ext/num4diff/libnum4diff.so"]
-    # y = f(xi)
+
+    ffi_lib FFI::Compiler::Loader.find('num4diff') 
+    # dy = f(xi)
     # @param [double] xi xiの値
-    # @return [double] y xiに対するyの値
+    # @return [double] xiに対するyの値
     callback   :f, [:double], :double
 
     #
@@ -19,8 +19,8 @@ module Num4DiffLib
     # @param [double] yi xiに対するyiの値
     # @param [double] xi xiの値
     # @param [double] h  刻み幅
-    # @param [callback] func xiに対する微分を計算する関数
-    # @return [double] yi_1 xi+hに対するyiの値
+    # @param [callback] func xiに対する傾きを計算する関数
+    # @return [double] xi+hに対するyiの値
     #
     attach_function :eulerMethod,
         :CNum4Diff_eulerMethod, [:double, :double, :double, :f], :double
@@ -29,8 +29,8 @@ module Num4DiffLib
     # @param [double] yi xiに対するyiの値
     # @param [double] xi xiの値
     # @param [double] h  刻み幅
-    # @param [callback] func xiに対する微分を計算する関数
-    # @return [double] yi_1 xi+hに対するyiの値
+    # @param [callback] func xiに対する傾きを計算する関数
+    # @return [double] xi+hに対するyiの値
     #
     attach_function :heunMethod,
         :CNum4Diff_heunMethod, [:double, :double, :double, :f], :double
@@ -40,8 +40,9 @@ module Num4DiffLib
     # @param [double] yi xiに対するyiの値
     # @param [double] xi xiの値
     # @param [double] h  刻み幅
-    # @param [callback] func xiに対する微分を計算する関数
-    # @return [double] yi_1 xi+hに対するyiの値
+    # @param [callback] func xiに対する傾きを計算する関数
+    # @return [double] xi+hに対するyiの値
+    #
     attach_function :rungeKuttaMethod,
         :CNum4Diff_rungeKuttaMethod, [:double, :double, :double, :f], :double
 end

metadata

@@ -1,43 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: num4diff
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.1.3
 platform: ruby
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.15.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 12.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 description: numerical solution for ordinaray differential equations
 email: siranovel@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/num4diff/Rakefile
 extra_rdoc_files: []
 files:
 - LICENSE
-- ext/num4diff/libnum4diff.so
+- ext/num4diff/CNum4Diff.c
+- ext/num4diff/CNum4Diff.h
+- ext/num4diff/Rakefile
 - lib/num4diff.rb
 homepage: http://github.com/siranovel/num4different
 licenses: