num4anova 0.0.15-java → 0.1.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81c39fe39ac94774f6ce94343e91c968190c63c510c9742d0a4b1e33c6f1a399
-  data.tar.gz: 9ba93973bdf9ad7237dd02702b67cd493335659a9b9f9162976ecb703ae351db
+  metadata.gz: 6009791608b43ea842ca9f342766aeb1fdb94ad284fdc0383b18296d7d7ab62f
+  data.tar.gz: 77a8b66f94c9a06cbcd39182b901f806820e0a7703aa058aac30ce45f66b69d6
 SHA512:
-  metadata.gz: c2d3ffd3cbf0bcb0c4955c64c587b48da9d878bb61ce5c3a2b547de4c6563bafbf6852aa032e378d318419e55d6583f4af6467a7456a598501d6acea5f2b9c91
-  data.tar.gz: 7d97f9780f7d68f601810ac5ba5bcda923050b80e11fbff53b78017ceb61d954a788bb62f9a1dc85bc79c7e4fd0be857c538d6647d7506f91c6100295891238d
+  metadata.gz: 20c1fd861a8fb4d972970bb86e0ba4f814efb17ba4369c96dc2a8c513bca1a68ddc0abc0933ce0ed56e4d14cba44b08a1eaa519f39b851626135574a85f092f3
+  data.tar.gz: 8a0a1948f71bcdb53813b26b2406bfb026af2154bf7db5f9cfa33f04509abaabab1819f5cae9d0b7a85e3f0dfe48f6ae62ac1ff8a35d779880712c905195e409

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## [0.1.1] - 2024-05-15
+### change
+- chg module name to Num4MultiCompLib from MultiCompLib
+
+## [0.0.16] - 2024-04-16
+
+### add
+- add fuction of bonferrono_test in friedman_test.
+
 ## [0.0.15] - 2024-04-13
 
 ### add

data/ext/num4anova/TwoWayLayout.java

@@ -1,6 +1,11 @@
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.apache.commons.math3.distribution.FDistribution;
+import org.apache.commons.math3.distribution.ChiSquaredDistribution;
 import java.util.Arrays;
+
+import org.apache.commons.math3.stat.ranking.NaNStrategy;
+import org.apache.commons.math3.stat.ranking.NaturalRanking;
+import org.apache.commons.math3.stat.ranking.TiesStrategy;
 public class TwoWayLayout {
     private static TwoWayLayout twoWay = new TwoWayLayout();
     public static TwoWayLayout getInstance() {
@@ -18,16 +23,26 @@ public class TwoWayLayout {
         double[] statistic = twoway.calcTestStatistic(xij);
         return twoway.execute_test(statistic, a);
     }
+    public boolean friedmanTest(double[][] xij, double a) {
+        OneWayAnovaTest twoway = new FriedmanTest();
+
+        double statistic = twoway.calcTestStatistic(xij);
+        return twoway.execute_test(statistic, a);
+    }
     /*********************************/
     /* interface define              */
     /*********************************/
     private interface TwoWayAnovaTest {
         double[] calcTestStatistic(double[][][] xij);
-        boolean[] execute_test(double statistic[], double a);
+        boolean[] execute_test(double[] statistic, double a);
     }
     private interface TwoWay2AnovaTest {
         double[] calcTestStatistic(double[][] xij);
-        boolean[] execute_test(double statistic[], double a);
+        boolean[] execute_test(double[] statistic, double a);
+    }
+    private interface OneWayAnovaTest {
+        double calcTestStatistic(double[][] xi);
+        boolean execute_test(double statistic, double a);
     }
     /*********************************/
     /* class define                  */
@@ -162,7 +177,7 @@ public class TwoWayLayout {
             }
             return sumDrift;
         }
-        public boolean[] execute_test(double statistic[], double a) {
+        public boolean[] execute_test(double[] statistic, double a) {
             boolean[] ret = new boolean[3];
 
             ret[0] = evaluation(new FDistribution(an, en), statistic[0], a);
@@ -269,7 +284,7 @@ public class TwoWayLayout {
             return sumDrift;
         }
 
-        public boolean[] execute_test(double statistic[], double a) {
+        public boolean[] execute_test(double[] statistic, double a) {
             boolean[] ret = new boolean[2];
 
             ret[0] = evaluation(new FDistribution(an, en), statistic[0], a);
@@ -282,5 +297,64 @@ public class TwoWayLayout {
             return (statistic >= r_val) ? true : false;
         }
     }
+    // フリードマンの検定
+    private class FriedmanTest implements  OneWayAnovaTest{
+        private NaturalRanking naturalRanking;
+        private int n = 0;
+        private int k = 0;
+        public FriedmanTest()  {
+            naturalRanking = new NaturalRanking(NaNStrategy.FIXED, 
+                                                 TiesStrategy.AVERAGE);
+        }
+        public double calcTestStatistic(double[][] xij) {
+            n = xij[0].length;
+            k = xij.length;
+            double[][] z = concatSample(xij);
+            double[][] ranks = calcRankij(z);
+            double[] sumRankXi = calcSumRankXi(ranks);
+            double kw = 0.0;
+
+            for(int i = 0; i < sumRankXi.length; i++) {
+                kw += sumRankXi[i] * sumRankXi[i];
+            }
+            return 12.0 / (n * k * (k + 1.0)) * kw - 3.0 * n * (k + 1.0);
+        }
+        public boolean execute_test(double statistic, double a) {
+            ChiSquaredDistribution chi2Dist = new ChiSquaredDistribution(k - 1);
+
+            double r_val = chi2Dist.inverseCumulativeProbability(1.0 - a);
+
+            return (r_val < statistic) ? true : false;
+        }
+        private double[][] concatSample(double[][] xi) {
+            double[][] z = new double[n][k];
+
+            for(int i = 0; i < k; i++) {
+                for(int j = 0; j < n; j++) {
+                    z[j][i] = xi[i][j];
+                }
+            }
+            return z;
+        }
+        private double[][] calcRankij(double[][] z) {
+            double[][] ranks = new double[n][k];
+
+            for(int i = 0; i < n; i++) {
+                ranks[i] = naturalRanking.rank(z[i]);
+            }
+            return ranks;
+        }
+        private double[] calcSumRankXi(double[][] ranks) {
+            double[] sumRi = new double[k];
+
+            for(int i = 0; i < k; i++) {
+                sumRi[i] = 0.0;
+                for(int j = 0; j < n; j++) {
+                    sumRi[i] += ranks[j][i];
+                }
+            }
+            return sumRi;
+        }
+    }
 }
 

data/lib/num4anova.rb

@@ -157,12 +157,11 @@ module Num4AnovaLib
         #   @param [array]  xi データ(double[][])
         #   @param [double] a         有意水準
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
+        # @example
         #   xi = [
-        #       [12.2, 18.8, 18.2],
-        #       [22.2, 20.5, 14.6],
-        #       [20.8, 19.5, 26.3],
-        #       [26.4, 32.5, 31.3],
-        #       [24.5, 21.2, 22.4],
+        #        [12.2, 18.8, 18.2],
+        #        [22.2, 20.5, 14.6, 20.8, 19.5, 26.3],
+        #        [26.4, 32.5, 31.3, 24.5, 21.2, 22.4],
         #   ]
         #   oneWay = Num4AnovaLib::OneWayLayoutLib.new 
         #   oneWay.kruskalwallis_test(xi, 0.05)
@@ -236,6 +235,27 @@ module Num4AnovaLib
         def twoway2_anova(xij, a)
             ret = @twoWay.twoway2Anova(xij.to_java(Java::double[]), a)
             return ret.to_a
+        end
+        # フリードマン検定
+        #
+        # @overload friedman_test(xij, a)
+        #   @param [array]  xij データ(double[][])
+        #   @param [double] a         有意水準
+        #   @return [boolean] 検定結果(boolean true:棄却域内 false:棄却域外)
+        # @example
+        #   xij = [
+        #       [13.6, 15.6, 9.2],
+        #       [22.3, 23.3, 13.3],
+        #       [26.7, 28.8, 15.0],
+        #       [28.0, 31.2, 15.8],
+        #   ]
+        #   twoWay = Num4AnovaLib::TwoWayLayoutLib.new 
+        #   twoWay.friedman_test(xij, 0.05)
+        #   =>
+        #     true
+        def friedman_test(xij, a)
+            ret = @twoWay.friedmanTest(xij.to_java(Java::double[]), a)
+            return ret
         end        
     end
     # 共分散分析

data/lib/{multicomp.rb → num4multicomp.rb}

@@ -8,7 +8,7 @@ require_relative('dunnet')
 java_import 'MultiComp'
 # 多重比較を行う
 #  (Apache commoms math3使用)
-module MultiCompLib
+module Num4MultiCompLib
     # パラメトリック検定
     class ParametrixTestLib
         include DunnetTestLib

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4anova
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.1
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-13 00:00:00.000000000 Z
+date: 2024-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -69,9 +69,9 @@ files:
 - lib/dunnet.rb
 - lib/jcommon-1.0.23.jar
 - lib/jfreechart-1.5.4.jar
-- lib/multicomp.rb
 - lib/num4anova.rb
-homepage: http://github.com/siranovel/num4varanly
+- lib/num4multicomp.rb
+homepage: http://github.com/siranovel/num4anova
 licenses:
 - MIT
 metadata: {}