num4hypothtst 0.0.5-java → 0.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ff3dd6e82c9be96c99627583dc57403f357a9fd7cfd47d20b4a9b91aa169ff
-  data.tar.gz: 52b8a0961a549a213d35e431b73b50935642a4f2ad5aa69cf05ca9637577b1bb
+  metadata.gz: ddedb6b175ca41c15b5ebe6328faaa1cb05bfac2ca7098147960cdb4ab952dfd
+  data.tar.gz: a42501c4c92de4bbcffb5c7da8be7098101d890d947fbc98ec4e486be6122f7e
 SHA512:
-  metadata.gz: 6da36a8c168a2a0055483738640ccecb5babb6d3268c109240e330a7cae3da486582dcef1271336402e2cba567911a2e0e59ef6c25c8963ef4428283be387821
-  data.tar.gz: 43af75b2187bdb1e4fce7202b5414cfd1534ab4246f30713cfa8ddee56457bbc4d03ebb5a5ca0ca4d271a32acba2512877fe8b70974a6db7eefa2190ebf79d2e
+  metadata.gz: 1cea2d82655c054806b9a021503a4966e9e1bbf12937e09be304e4ecc95f84004d3680920373a3891bbb9b44941623993c921bcf127bca7f821f0247cbec7356
+  data.tar.gz: a9b38cb24b307f86284075791454ec5b5452abeaa7d010b6711adda1d08c6f52fe5800f16c40e5025ab8669859df58364801e4d26010d658d63ed63b7dad54d6

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## [0.0.7] - 2024-01-08
+
+### change
+- function of gntest is bug fix.
+
+## [0.0.6] - 2023-12-27
+
+### delete
+- del function of wilcoxon.
+
+### add
+- add function of decorrelation.
+- add function of populationCorre.
+
 ## [0.0.5] - 2023-12-19
 
 ### add

data/ext/num4hypothtst/hypothtst/DecorrTest.java

@@ -0,0 +1,16 @@
+package hypothtst;
+
+import org.apache.commons.math3.distribution.TDistribution;
+public class DecorrTest implements HypothTest {
+    private static HypothTest hypothTest = new DecorrTest();
+    public static HypothTest getInstance() {
+        return hypothTest;
+    }
+    public boolean twoSideTest(double r, int n, double a) {
+        double statistic = Math.abs(r) * Math.sqrt(n - 2.0) / Math.sqrt(1.0 - r * r);
+        TDistribution tDist = new TDistribution(n - 2);
+        double p = 1.0 - tDist.cumulativeProbability(statistic);
+
+        return (p < a) ? true : false;
+    }
+}

data/ext/num4hypothtst/hypothtst/GrubbsTest.java

@@ -2,10 +2,10 @@ package hypothtst;
 
 import org.apache.commons.math3.distribution.TDistribution;
 // グラブス・スミルノフの外れ値の検定
-public class GrubbsTest {
-    private static GrubbsTest grubbs = new GrubbsTest();
-    public static GrubbsTest getInstance() {
-        return grubbs;
+public class GrubbsTest implements HypothTest2 {
+    private static HypothTest2 hypothTest2 = new GrubbsTest();
+    public static HypothTest2 getInstance() {
+        return hypothTest2;
     }
     public boolean twoSideTest(double statistic, int n, double a) {
         double r_val = calcGnValue(n, a / 2.0);
@@ -15,8 +15,9 @@ public class GrubbsTest {
         double r_val = calcGnValue(n, a);
         return evaluation(statistic, r_val);
     }
+
     private double calcGnValue(int n, double a) {
-        TDistribution tDist = new TDistribution(n);
+        TDistribution tDist = new TDistribution(n - 2);
         double t = tDist.inverseCumulativeProbability(a / n);
         double gn = (n - 1) * t / Math.sqrt(n * (n - 2 + t * t));
 

data/ext/num4hypothtst/hypothtst/HypothTest.java

@@ -2,10 +2,6 @@ package hypothtst;
 
 // 仮設検定
 interface HypothTest {
-    boolean tDistTest(double statistic, double df, double a);
-    boolean chi2DistTest(double statistic, double df, double a);
-    boolean normDistTest(double statistic, double a);
-    boolean fDistTest(double statistic, double nf, double df, double a);
-    boolean wilcoxon(double statistic, int n, double a);
+    boolean twoSideTest(double statistic, int n, double a);
 }
 

data/ext/num4hypothtst/hypothtst/HypothTest2.java

@@ -0,0 +1,8 @@
+package hypothtst;
+
+// 仮設検定
+interface HypothTest2 {
+    boolean twoSideTest(double statistic, int n, double a);
+    boolean oneSideTest(double statistic, int n, double a);
+}
+

data/ext/num4hypothtst/hypothtst/HypothTest3.java

@@ -0,0 +1,12 @@
+package hypothtst;
+
+// 仮設検定
+interface HypothTest3 {
+    boolean tDistTest(double statistic, double df, double a);
+    boolean chi2DistTest(double statistic, double df, double a);
+    boolean normDistTest(double statistic, double a);
+    boolean fDistTest(double statistic, double nf, double df, double a);
+
+    boolean populationCorre(double r, int n, double rth0, double a);
+}
+

data/ext/num4hypothtst/hypothtst/LeftSideTest.java

@@ -6,10 +6,10 @@ import org.apache.commons.math3.distribution.NormalDistribution;
 import org.apache.commons.math3.distribution.FDistribution;
 
 // 片側検定(左側)
-public class LeftSideTest implements HypothTest {
-    private static HypothTest hupothTest = new LeftSideTest();
-    public static HypothTest getInstance() {
-        return hupothTest;
+public class LeftSideTest implements HypothTest3 {
+    private static HypothTest3 hypothTest3 = new LeftSideTest();
+    public static HypothTest3 getInstance() {
+        return hypothTest3;
     }
     public boolean tDistTest(double statistic, double df, double a) {
         TDistribution tDist = new TDistribution(df);
@@ -35,15 +35,16 @@ public class LeftSideTest implements HypothTest {
 
         return evaluation(statistic, l_val);
     }
-    public boolean wilcoxon(double statistic, int n, double a) {
-        boolean ret = true;
-        double e_t = n * (n  + 1.0) / 4.0;
-        double var_t = n * (n + 1.0) * (2.0 * n + 1.0) / 24.0;
-        double z = (statistic - e_t) / Math.sqrt(var_t);
-
-        return normDistTest(z, a);
+    public boolean populationCorre(double r, int n, double rth0, double a) {
+        double statistic = Math.sqrt(n-3.0) * 
+               (
+               0.5 * Math.log((1.0 + r) / (1.0 - r)) 
+             - 0.5 * Math.log((1.0 + rth0) / (1.0 - rth0))
+               );
+
+        return normDistTest(statistic, a);
     }
-
+    
     private boolean evaluation(double statistic, double l_val) {
         boolean ret = true;
 

data/ext/num4hypothtst/hypothtst/RightSideTest.java

@@ -5,10 +5,10 @@ import org.apache.commons.math3.distribution.ChiSquaredDistribution;
 import org.apache.commons.math3.distribution.NormalDistribution;
 import org.apache.commons.math3.distribution.FDistribution;
 // 片側検定(右側)
-public class RightSideTest implements HypothTest {
-    private static HypothTest hupothTest = new RightSideTest();
-    public static HypothTest getInstance() {
-        return hupothTest;
+public class RightSideTest implements HypothTest3 {
+    private static HypothTest3 hypothTest3 = new RightSideTest();
+    public static HypothTest3 getInstance() {
+        return hypothTest3;
     }
     public boolean tDistTest(double statistic, double df, double a) {
         TDistribution tDist = new TDistribution(df);
@@ -34,14 +34,16 @@ public class RightSideTest implements HypothTest {
 
         return evaluation(statistic, r_val);
     }
-    public boolean wilcoxon(double statistic, int n, double a) {
-        boolean ret = true;
-        double e_t = n * (n  + 1.0) / 4.0;
-        double var_t = n * (n + 1.0) * (2.0 * n + 1.0) / 24.0;
-        double z = (statistic - e_t) / Math.sqrt(var_t);
-
-        return normDistTest(z, a);
+    public boolean populationCorre(double r, int n, double rth0, double a) {
+       double statistic = Math.sqrt(n-3.0) * 
+               (
+               0.5 * Math.log((1.0 + r) / (1.0 - r)) 
+             - 0.5 * Math.log((1.0 + rth0) / (1.0 - rth0))
+               );
+
+        return normDistTest(statistic, a);
     }
+
     private boolean evaluation(double statistic, double r_val) {
         boolean ret = true;
 

data/ext/num4hypothtst/hypothtst/TwoSideTest.java

@@ -6,10 +6,10 @@ import org.apache.commons.math3.distribution.NormalDistribution;
 import org.apache.commons.math3.distribution.FDistribution;
 
 // 両側検定
-public class TwoSideTest implements HypothTest {
-    private static HypothTest hupothTest = new TwoSideTest();
-    public static HypothTest getInstance() {
-        return hupothTest;
+public class TwoSideTest implements HypothTest3 {
+    private static HypothTest3 hypothTest3 = new TwoSideTest();
+    public static HypothTest3 getInstance() {
+        return hypothTest3;
     }
     public boolean tDistTest(double statistic, double df, double a) {
         TDistribution tDist = new TDistribution(df);
@@ -39,13 +39,14 @@ public class TwoSideTest implements HypothTest {
 
         return evaluation(statistic, l_val, r_val);
     }
-    public boolean wilcoxon(double statistic, int n, double a) {
-        boolean ret = true;
-        double e_t = n * (n  + 1.0) / 4.0;
-        double var_t = n * (n + 1.0) * (2.0 * n + 1.0) / 24.0;
-        double z = (statistic - e_t) / Math.sqrt(var_t);
-
-        return normDistTest(z, a);
+    public boolean populationCorre(double r, int n, double rth0, double a) {
+        double statistic = Math.sqrt(n-3.0) * 
+               (
+               0.5 * Math.log((1.0 + r) / (1.0 - r)) 
+             - 0.5 * Math.log((1.0 + rth0) / (1.0 - rth0))
+               );
+
+        return normDistTest(statistic, a);
     }
 
     private boolean evaluation(double statistic, double l_val, double r_val) {

data/lib/num4hypothtst.rb

@@ -6,6 +6,7 @@ java_import 'hypothtst.TwoSideTest'
 java_import 'hypothtst.RightSideTest'
 java_import 'hypothtst.LeftSideTest'
 java_import 'hypothtst.GrubbsTest'
+java_import 'hypothtst.DecorrTest'
 
 # 統計的仮設検定のためのライブラリ
 #  (Apache commoms math3使用)
@@ -13,7 +14,7 @@ module Num4HypothTestLib
     # 両側検定
     class TwoSideTestLib
         def initialize
-            @hypothTest = TwoSideTest.getInstance()
+            @hypothTest3 = TwoSideTest.getInstance()
         end
         # T検定
         #
@@ -23,7 +24,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def tDistTest(statistic, df, a)
-            return @hypothTest.tDistTest(statistic, df, a)
+            return @hypothTest3.tDistTest(statistic, df, a)
         end
         # 階2乗検定
         #
@@ -33,7 +34,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def chi2DistTest(statistic, df, a)
-            return @hypothTest.chi2DistTest(statistic, df, a)
+            return @hypothTest3.chi2DistTest(statistic, df, a)
         end
         # 標準正規分布検定
         #
@@ -42,7 +43,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def normDistTest(statistic, a)
-            return @hypothTest.normDistTest(statistic, a)
+            return @hypothTest3.normDistTest(statistic, a)
         end
         # F検定
         #
@@ -53,26 +54,26 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def fDistTest(statistic, nf, df, a)
-            return @hypothTest.fDistTest(statistic, nf, df, a)
+            return @hypothTest3.fDistTest(statistic, nf, df, a)
         end
-        # ウィルコクソン符号順位検定
+
+        # 母相関係数の検定量
         #
-        # @overload wilcoxon(statistic, n, a)
-        #   @param [int] statistic ウィルコクソン符号順位の検定統計量
-        #   @param [int] n         データの個数
-        #   @param [double] a         有意水準
+        # @overload populationCorre(r, n, rth0, a)
+        #   @param [double] r    標本相関係数
+        #   @param [int]    n    自由度
+        #   @param [double] rth0 母相関係数
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         # @note
-        #   内部でN(0,1)に近似して検定
-        def wilcoxon(statistic, n, a)
-            return @hypothTest.wilcoxon(statistic, n, a)
+        #   標準正規分布 N(0,1*1)に従う(近似的)
+        def populationCorre(r, n, rth0, a)
+            return @hypothTest3.populationCorre(r, n, rth0, a);
         end
-
     end
     # 片側(右側)検定
     class RightSideTestLib
         def initialize
-            @hypothTest = RightSideTest.getInstance()
+            @hypothTest3 = RightSideTest.getInstance()
         end
         # T検定
         #
@@ -82,7 +83,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def tDistTest(statistic, df, a)
-            return @hypothTest.tDistTest(statistic, df, a)
+            return @hypothTest3.tDistTest(statistic, df, a)
         end
         # 階2乗検定
         #
@@ -92,7 +93,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def chi2DistTest(statistic, df, a)
-            return @hypothTest.chi2DistTest(statistic, df, a)
+            return @hypothTest3.chi2DistTest(statistic, df, a)
         end
         # 標準正規分布検定
         #
@@ -101,7 +102,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def normDistTest(statistic, a)
-            return @hypothTest.normDistTest(statistic, a)
+            return @hypothTest3.normDistTest(statistic, a)
         end
         # F検定
         #
@@ -112,25 +113,26 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def fDistTest(statistic, nf, df, a)
-            return @hypothTest.fDistTest(statistic, nf, df, a)
+            return @hypothTest3.fDistTest(statistic, nf, df, a)
         end
-        # ウィルコクソン符号順位検定
+
+        # 母相関係数の検定量
         #
-        # @overload wilcoxon(statistic, n, a)
-        #   @param [int] statistic ウィルコクソン符号順位の検定統計量
-        #   @param [int] n         データの個数
-        #   @param [double] a         有意水準
+        # @overload populationCorre(r, n, rth0, a)
+        #   @param [double] r    標本相関係数
+        #   @param [int]    n    自由度
+        #   @param [double] rth0 母相関係数
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         # @note
-        #   内部でN(0,1)に近似して検定
-        def wilcoxon(statistic, n, a)
-            return @hypothTest.wilcoxon(statistic, n, a)
+        #   標準正規分布 N(0,1*1)に従う(近似的)
+        def populationCorre(r, n, rth0, a)
+            return @hypothTest3.populationCorre(r, n, rth0, a);
         end
     end
     # 片側(左側)検定
     class LeftSideTestLib
         def initialize
-            @hypothTest = LeftSideTest.getInstance()
+            @hypothTest3 = LeftSideTest.getInstance()
         end
         # T検定
         #
@@ -140,7 +142,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def tDistTest(statistic, df, a)
-            return @hypothTest.tDistTest(statistic, df, a)
+            return @hypothTest3.tDistTest(statistic, df, a)
         end
         # 階2乗検定
         #
@@ -150,7 +152,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def chi2DistTest(statistic, df, a)
-            return @hypothTest.chi2DistTest(statistic, df, a)
+            return @hypothTest3.chi2DistTest(statistic, df, a)
         end
         # 標準正規分布検定
         #
@@ -159,7 +161,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def normDistTest(statistic, a)
-            return @hypothTest.normDistTest(statistic, a)
+            return @hypothTest3.normDistTest(statistic, a)
         end
         # F検定
         #
@@ -170,25 +172,26 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def fDistTest(statistic, nf, df, a)
-            return @hypothTest.fDistTest(statistic, nf, df, a)
+            return @hypothTest3.fDistTest(statistic, nf, df, a)
         end
-        # ウィルコクソン符号順位検定
+
+        # 母相関係数の検定量
         #
-        # @overload wilcoxon(statistic, n, a)
-        #   @param [int] statistic ウィルコクソン符号順位の検定統計量
-        #   @param [int] n         データの個数
-        #   @param [double] a         有意水準
+        # @overload populationCorre(r, n, rth0, a)
+        #   @param [double] r    標本相関係数
+        #   @param [int]    n    自由度
+        #   @param [double] rth0 母相関係数
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         # @note
-        #   内部でN(0,1)に近似して検定
-        def wilcoxon(statistic, n, a)
-            return @hypothTest.wilcoxon(statistic, n, a)
+        #   標準正規分布 N(0,1*1)に従う(近似的)
+        def populationCorre(r, n, rth0, a)
+            return @hypothTest3.populationCorre(r, n, rth0, a);
         end
     end
     # グラブス・スミルノフの外れ値の検定
     class GrubbsTestLib
         def initialize
-            @hypothTest = GrubbsTest.getInstance()
+            @hypothTest2 = GrubbsTest.getInstance()
         end
         # 両側検定
         #
@@ -198,7 +201,7 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def twoSideTest(statistic, n, a)
-            return @hypothTest.twoSideTest(statistic, n, a)
+            return @hypothTest2.twoSideTest(statistic, n, a)
         end
         # 片側検定
         #
@@ -208,7 +211,23 @@ module Num4HypothTestLib
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         def oneSideTest(statistic, n, a)
-            return @hypothTest.oneSideTest(statistic, n, a)
+            return @hypothTest2.oneSideTest(statistic, n, a)
+        end
+    end
+    # 無相関の検定
+    class DecorrTestLib
+        def initialize
+            @hypothTest = DecorrTest.getInstance()
+        end
+        # 両側検定
+        #
+        # @overload twoSideTest(r, n, a)
+        #   @param [double] r         相関係数
+        #   @param [int]    n         自由度
+        #   @param [double] a         有意水準
+        #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
+        def twoSideTest(r, n, a)
+            return @hypothTest.twoSideTest(r, n, a)
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4hypothtst
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-19 00:00:00.000000000 Z
+date: 2024-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,8 +61,11 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
+- ext/num4hypothtst/hypothtst/DecorrTest.java
 - ext/num4hypothtst/hypothtst/GrubbsTest.java
 - ext/num4hypothtst/hypothtst/HypothTest.java
+- ext/num4hypothtst/hypothtst/HypothTest2.java
+- ext/num4hypothtst/hypothtst/HypothTest3.java
 - ext/num4hypothtst/hypothtst/LeftSideTest.java
 - ext/num4hypothtst/hypothtst/RightSideTest.java
 - ext/num4hypothtst/hypothtst/TwoSideTest.java