num4normality 0.0.7-java → 0.0.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d445077e57757b20233ab78457bdd1b11a3b1851a8341ab7e28d778ef180d68d
-  data.tar.gz: 1e7b9c47b46bffbc4ae6dafa164b6f2b6d3c0707b6ad4478267740248b098498
+  metadata.gz: 28c1bcf4f9952a2f18587d5b23d301a43ea31cd109d6a2d99ce665f900877bbf
+  data.tar.gz: 29a902d3ef52739cb913bc523c5488ebcc14ac3288d8babc8d7e64fd28448cbf
 SHA512:
-  metadata.gz: 5bb019e46c2b0deae1b6f2e2e5776926621620fd787903a3fec119bece63b04e64b979f3c5b3de08883a487fb6ec503d49f43c7acc229b1ab33134c24e5d1179
-  data.tar.gz: 8f60222acffc237d2961b909209182cdf9ef2e7fecad9248553be02853c9690cfeefef425f49a4ad5bdff5a0e733d3bd9a434b74b09ef934d94f2ac3f851345b
+  metadata.gz: 66fe7346cae038b6a399395d46863b2a7aaecff96687b451075e2affa08236c1f8eb5b18066eed22eafac9f1ac7c719989e43c07082fceb3d17b9b6d4310fe4b
+  data.tar.gz: 3b621221e49cfaabf960cb5f8d413aadb53ec1e280e7f3c65b1cb2d70dd8c960129e239aee017365d9910c609b84b35d875f7e12fcc5a3f0f84284db3a9d78b6

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 ## Unreleased
 
+## [0.0.9] - 2024-05-11
+### add
+- add function of adtest.
+
+## [0.0.8] - 2023-12-30
+
+### Fixed
+- fix fuction of ppplot.
+
 ## [0.0.7] - 2023-12-26
 
 ### add

data/ext/num4normality/Normality.java

@@ -1,6 +1,7 @@
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.StandardChartTheme;
 import org.jfree.chart.ChartFactory;
+import org.jfree.chart.ChartUtils;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.data.xy.XYSeries;
 
@@ -22,70 +23,77 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import org.apache.commons.math3.stat.StatUtils;
 import org.apache.commons.math3.distribution.NormalDistribution;
 import org.apache.commons.math3.distribution.ChiSquaredDistribution;
+import org.apache.commons.math3.distribution.TDistribution;
 import org.apache.commons.math3.stat.regression.SimpleRegression;
 import java.util.Arrays;
 import java.text.DecimalFormat;
 
 import org.apache.commons.math3.stat.inference.TestUtils;
 public class Normality {
-    public static void qqplot(String dname, double[] xi) {
+    public static void qqPlot(String dname, double[] xi) {
         ChartPlot plot = new QQChartPlot();
         JFreeChart chart = plot.createChart("正規Q-Qプロット", dname, xi);
 
         plot.writeJPEG("qqplot.jpeg", chart, 800, 500);        
     }
-    public static void ksplot(String dname, double[] xi) {
+    public static void ksPlot(String dname, double[] xi) {
         ChartPlot plot = new KSChartPlot();
         JFreeChart chart = plot.createChart("コルモゴルフ・スミルノフ検定", dname, xi);
 
         plot.writeJPEG("ksplot.jpeg", chart, 800, 500);        
        
     }
-    public static void qqksplot(String dname, double[] xi) {
-         ChartPlot plot = new QQKSChartPlot();
+    public static void qqksPlot(String dname, double[] xi) {
+        ChartPlot plot = new QQKSChartPlot();
         JFreeChart chart = plot.createChart("Q-Q and コルモゴルフ・スミルノフ", dname, xi);
 
         plot.writeJPEG("qqksplot.jpeg", chart, 1000, 800);        
     }
-    public static void ppplot(String dname, double[] xi) {
+    public static void ppPlot(String dname, double[] xi) {
         ChartPlot plot = new PPChartPlot();
         JFreeChart chart = plot.createChart("正規P-Pプロット", dname, xi);
 
         plot.writeJPEG("ppplot.jpeg", chart, 800, 500);        
     }
-    public static void ppksplot(String dname, double[] xi) {
+    public static void ppksPlot(String dname, double[] xi) {
         ChartPlot plot = new PPKSChartPlot();
         JFreeChart chart = plot.createChart("P-P and コルモゴルフ・スミルノフ", dname, xi);
 
         plot.writeJPEG("ppksplot.jpeg", chart, 800, 500);        
        
     }
-    public static boolean kstest(double[] xi) {
+    public static boolean ksTest(double[] xi) {
         KSTest ks = new KSTest();
 
         return ks.test(xi);
     }
-    public static boolean skewnesstest(double[] xi) {
-        DAgostinosTest daigo = new SkewnessTest();
+    public static boolean skewnessTest(double[] xi) {
+        HypothesisTest daigo = new SkewnessTest();
 
         double b1 = daigo.calcTestStatistic(xi);
-        return daigo.test(b1, 0.05);
+        return daigo.test(b1, HypothesisTest.P);
     }
-    public static boolean kurtosistest(double[] xi) {
-        DAgostinosTest daigo = new KurtosisTest();
+    public static boolean kurtosisTest(double[] xi) {
+        HypothesisTest daigo = new KurtosisTest();
 
         double b2 = daigo.calcTestStatistic(xi);
-        return daigo.test(b2, 0.05);
+        return daigo.test(b2, HypothesisTest.P);
     }
-    public static boolean omnibustest(double[] xi) {
-        DAgostinosTest daigo = new OmnibusTest();
+    public static boolean omnibusTest(double[] xi) {
+        HypothesisTest daigo = new OmnibusTest();
 
         double x = daigo.calcTestStatistic(xi);
-        return daigo.test(x, 0.05);
+        return daigo.test(x, HypothesisTest.P);
+    }
+    public static boolean adTest(double[] xi) {
+        HypothesisTest daigo = new ADTest();
+        double x = daigo.calcTestStatistic(xi);
+
+        return daigo.test(x, HypothesisTest.P);
     }
-    
     /*********************************/
     /* interface define              */
     /*********************************/
@@ -107,7 +115,11 @@ public class Normality {
     private interface CreatePlot {
         XYPlot createPlot(String dname, double[] xi);
     }
-    private interface DAgostinosTest {
+    private interface HypothesisTest {
+        /* フィールド */
+        static final double P = 0.05;
+
+        /* メゾット */
         double calcTestStatistic(double[] xi);
         boolean test(double statistic, double a);
     }
@@ -120,7 +132,10 @@ public class Normality {
             XYPlot plot = createPlot(dname, xi);
 
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart(title, plot);
+            JFreeChart chart = new JFreeChart(title, plot);
+
+            ChartUtils.applyCurrentTheme(chart);
+            return chart;
         }
         private XYPlot createPlot(String dname, double[] xi) {
             CreatePlot plotImpl = new QQPlot();
@@ -223,7 +238,10 @@ public class Normality {
             XYPlot plot = createPlot(dname, xi);
             
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart(title, plot);
+            JFreeChart chart = new JFreeChart(title, plot);
+
+            ChartUtils.applyCurrentTheme(chart);
+            return chart;
         }
         private XYPlot createPlot(String dname, double[] xi) {
             CreatePlot plotImpl = new KSPlot();
@@ -237,15 +255,14 @@ public class Normality {
                 int n = xi.length;
                 Arrays.sort(xi);
                 Arrays.stream(xi).forEach(stat::addValue);
-                double m = stat.getMean();     // 平均
-                double sd = stat.getStandardDeviation();// 標準偏差
                 double sum = stat.getSum();
                 double[][] data = new double[n][2];
                 double p = 0.0;
+                double z[] = StatUtils.normalize(xi);
 
                 for (int i = 0; i < n; i++) {
                     p += xi[i] / sum;
-                    data[i][0] = (xi[i] - m) / sd;
+                    data[i][0] = z[i];
                     data[i][1] = p;
                 }
                 return data;
@@ -326,7 +343,10 @@ public class Normality {
             XYPlot plot = createPlot(dname, xi);
             
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart(title, plot);
+            JFreeChart chart = new JFreeChart(title, plot);
+
+            ChartUtils.applyCurrentTheme(chart);
+            return chart;
         }
         private XYPlot createPlot(String dname, double[] xi) {
             /*--- 横軸 ---*/
@@ -351,7 +371,10 @@ public class Normality {
             XYPlot plot = createPlot(dname, xi);
 
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart(title, plot);
+            JFreeChart chart = new JFreeChart(title, plot);
+
+            ChartUtils.applyCurrentTheme(chart);
+            return chart;
         }
         private XYPlot createPlot(String dname, double[] xi) {
             CreatePlot plotImpl = new PPPlot();
@@ -364,20 +387,17 @@ public class Normality {
                 NormalDistribution ndist = new NormalDistribution(0, 1);
 
                 int n = xi.length;
+                double[][] data = new double[n][2];
                 Arrays.sort(xi);
                 Arrays.stream(xi).forEach(stat::addValue);
-                double m = stat.getMean();     // 平均
-                double sd = stat.getStandardDeviation();// 標準偏差
                 double sum = stat.getSum();
-                double[][] data = new double[n][2];
                 double p = 0.0;
+                double z[] = StatUtils.normalize(xi);
 
                 for (int i = 0; i < n; i++) {
                     p += xi[i] / sum;
-                    double x = (xi[i] - m) / sd;
 
-                    ndist.cumulativeProbability(x);
-                    data[i][0] = ndist.cumulativeProbability(x);
+                    data[i][0] = ndist.cumulativeProbability(z[i]);
                     data[i][1] = p;
                 }
                 return data;
@@ -463,7 +483,10 @@ public class Normality {
             XYPlot plot = createPlot(dname, xi);
 
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart(title, plot);
+            JFreeChart chart = new JFreeChart(title, plot);
+
+            ChartUtils.applyCurrentTheme(chart);
+            return chart;
         }
         private XYPlot createPlot(String dname, double[] xi) {
             /*--- 縦軸 ---*/
@@ -485,23 +508,15 @@ public class Normality {
     // KS検定
     private static class KSTest {
         public boolean test(double[] xi) {
-            double[] data = new double[xi.length];
             Arrays.sort(xi);
-            DescriptiveStatistics stat = new DescriptiveStatistics();
-            Arrays.stream(xi).forEach(stat::addValue);
-            double m = stat.getMean();     // 平均
-            double sd = stat.getStandardDeviation();// 標準偏差
             NormalDistribution ndist = new NormalDistribution(0, 1);
+            double data[] = StatUtils.normalize(xi);
 
-            for (int i = 0; i < xi.length; i++) {
-                data[i] = (xi[i] - m) / sd; 
-            }
-            boolean ret = TestUtils.kolmogorovSmirnovTest(ndist, data, 0.05);
-            return ret;
+            return TestUtils.kolmogorovSmirnovTest(ndist, data, 0.05);
         }
     }
     // タコスディーノ検定(歪度)
-    private static class SkewnessTest implements DAgostinosTest {
+    private static class SkewnessTest implements HypothesisTest {
         private long n = 0;
         private NormalDistribution ndist = null;
         public SkewnessTest() {
@@ -531,7 +546,7 @@ public class Normality {
         }
     }
     // タコスディーノ検定(尖度)
-    private static class KurtosisTest implements DAgostinosTest {
+    private static class KurtosisTest implements HypothesisTest {
         private long n = 0;
         private NormalDistribution ndist = null;
         public KurtosisTest() {
@@ -561,9 +576,9 @@ public class Normality {
         }
     }
     // オムニバス検定
-    private static class OmnibusTest implements DAgostinosTest {
-        private DAgostinosTest skewness = null;
-        private DAgostinosTest kurtosis = null;
+    private static class OmnibusTest implements HypothesisTest {
+        private HypothesisTest skewness = null;
+        private HypothesisTest kurtosis = null;
         public OmnibusTest() {
             skewness = new SkewnessTest();
             kurtosis = new KurtosisTest();
@@ -581,5 +596,53 @@ public class Normality {
             return (p < a) ? true  : false;
         }
     }
+    // Anderson-Darling検定
+    private static class ADTest implements HypothesisTest {
+        public double calcTestStatistic(double[] xi) {
+            int n = xi.length;
+            double a2 = calcA2(xi, n);
+
+            return calcAD(a2, n);
+        }
+        public boolean test(double statistic, double a) {
+            double p = 0.0;
+            double statistic2 = statistic * statistic;
+
+            if (statistic <= 0.2) {
+                p = 1.0 - Math.exp(-13.436 + 101.14 * statistic - 223.73 * statistic);
+            }
+            else if ((0.2 < statistic) && (statistic <= 0.34)) {
+                p = 1.0 - Math.exp(-8.318 + 42.796 * statistic - 59.938 * statistic2);
+            }
+            else if ((0.34 < statistic) && (statistic <= 0.6)) {
+                p = Math.exp(0.9177 - 4.279 * statistic - 1.38 * statistic2);
+            }
+            else {
+                p = Math.exp(1.2937 - 5.709 * statistic + 0.0186 * statistic2);
+            }
+            return (p <= a) ? true : false;
+        }
+        private double calcA2(double[] xi, int n) {
+            Arrays.sort(xi);
+            double z[] = StatUtils.normalize(xi);
+            NormalDistribution ndist = new NormalDistribution(0, 1);
+            double s = 0.0;
+
+            for(int i = 0; i < n; i++) {
+                double fzi = ndist.cumulativeProbability(z[i]);
+                double fzni = ndist.cumulativeProbability(z[n - (i + 1)]);
+                double logzi = Math.log(fzi);
+                double logzni = Math.log(1 - fzni);
+
+                s += (2.0 * (i + 1.0) - 1.0) * (logzi + logzni);
+
+            }
+            return -1.0 * n - s / n;
+        }
+        // 補正値の計算(平均未知、分散未知の場合)
+        private double calcAD(double a2, int n) {
+            return a2 * (1.0 + 0.75 / n + 2.25 / (n * n));
+        }
+    }
 }
 

data/lib/num4normality.rb

@@ -22,7 +22,7 @@ module Num4NormalityLib
         # @note
         #   グラフは、jfreechartを使用
         def qqplot(dname, xi)
-            Normality.qqplot(dname, xi.to_java(Java::double))
+            Normality.qqPlot(dname, xi.to_java(Java::double))
         end
         # コルモゴルフ・スミルノフ検定プロット(1標本)
         #
@@ -33,11 +33,11 @@ module Num4NormalityLib
         # @example
         #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
         #   Num4NormalityLib.ksplot("LDH", xi)
-        #   => kstest.jpeg
+        #   => ksplot.jpeg
         # @note
         #   グラフは、jfreechartを使用
         def ksplot(dname, xi)
-            Normality.ksplot(dname, xi.to_java(Java::double))
+            Normality.ksPlot(dname, xi.to_java(Java::double))
         end
         # Q-Q and コルモゴルフ・スミルノフ検定プロット(1標本)
         #
@@ -52,7 +52,7 @@ module Num4NormalityLib
         # @note
         #   グラフは、jfreechartを使用
         def qqksplot(dname, xi)
-            Normality.qqksplot(dname, xi.to_java(Java::double))
+            Normality.qqksPlot(dname, xi.to_java(Java::double))
         end
         # P-Pプロット
         #
@@ -67,14 +67,14 @@ module Num4NormalityLib
         # @note
         #   グラフは、jfreechartを使用
         def ppplot(dname, xi)
-            Normality.ppplot(dname, xi.to_java(Java::double))
+            Normality.ppPlot(dname, xi.to_java(Java::double))
         end
         # P-P and コルモゴルフ・スミルノフ検定プロット(1標本)
         #
         # @overload ppksplot(dname, xi)
         #   @param [String] dname データ名
         #   @param  [Array]  xi データ(double[])
-        #   @return [void]  ppplot.jpegファイルを出力
+        #   @return [void]  ppksplot.jpegファイルを出力
         # @example
         #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
         #   Num4NormalityLib.ppksplot("LDH", xi)
@@ -82,7 +82,7 @@ module Num4NormalityLib
         # @note
         #   グラフは、jfreechartを使用
         def ppksplot(dname, xi)
-            Normality.ppksplot(dname, xi.to_java(Java::double))
+            Normality.ppksPlot(dname, xi.to_java(Java::double))
         end
         # コルモゴルフ・スミルノフ検定(1標本)
         #
@@ -94,7 +94,7 @@ module Num4NormalityLib
         #   Num4NormalityLib.kstest(xi)
         #   => false
         def kstest(xi)
-            Normality.kstest(xi.to_java(Java::double))
+            Normality.ksTest(xi.to_java(Java::double))
         end
 
         # タコスディーノ検定(歪度)
@@ -107,7 +107,7 @@ module Num4NormalityLib
         #   Num4NormalityLib.skewnesstest(xi)
         #   => false
         def skewnesstest(xi)
-            Normality.skewnesstest(xi.to_java(Java::double))
+            Normality.skewnessTest(xi.to_java(Java::double))
         end
         # タコスディーノ検定(尖度)
         #
@@ -119,7 +119,7 @@ module Num4NormalityLib
         #   Num4NormalityLib.kurtosistest(xi)
         #   => false
         def kurtosistest(xi)
-            Normality.kurtosistest(xi.to_java(Java::double))
+            Normality.kurtosisTest(xi.to_java(Java::double))
         end
         # オムニバス検定
         #
@@ -131,7 +131,19 @@ module Num4NormalityLib
         #   Num4NormalityLib.omnibustest(xi)
         #   => false
         def omnibustest(xi)
-             Normality.omnibustest(xi.to_java(Java::double))
+             Normality.omnibusTest(xi.to_java(Java::double))
+        end
+        # Anderson-darling検定
+        #
+        # @overload adtest(xi)
+        #   @param  [Array]  xi データ(double[])
+        #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
+        # @example
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
+        #   Num4NormalityLib.adtest(xi)
+        #   => false
+        def adtest(xi)
+             Normality.adTest(xi.to_java(Java::double))
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4normality
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2024-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake