num4normality 0.0.1-java → 0.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be725c6a9b20d5c4ca46f2543c96e293be67c9bcf2638816cb29331eadb8180
-  data.tar.gz: d18160bcab51e0760a2e4b533be709235f06d18b2150bb05cc4a9ef66a96179f
+  metadata.gz: a735c6ff8848bf8f8c56b7e1bc0b1794a5675ab93d3e9a13477cf8d3041b50d9
+  data.tar.gz: 87b102e787cd5835ce2c78ebf11e0abf8a2092462cbf9ff7fd73e06a3884d43b
 SHA512:
-  metadata.gz: 1e9c798eaa8043b712da5940f361c8adffa82f4436cccc34843286baad3109d481354fea2a8f6f914f4f8205f2ff0393c31f47cdde589cdb408506257ba06491
-  data.tar.gz: 9f257c671f62f84c224a03641d802d7f275a6d042c80d336f4a666283def61b53a169527c6ec854676ff3344da8e60bcb2a0e6716b8afa8e31d700172d91fed2
+  metadata.gz: c808547090cef242d28bbfbc46243fc44726a69d22c18a03916f76ccb7e91b58b7c3a074f1fe7fd7a17c492da9978197358db941c20c1255fcd90773cc28e54d
+  data.tar.gz: ff78669f413ae51fae98f4fb683981b12793f2a93eaeb17438124e1ad3771b476a34955e4482bc669bcd4044ec31a95f08e9c0c93b89a802b03fe7d664d03c4c

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 ## Unreleased
 
+## [0.0.3] - 2023-12-18
+
+### add
+- add function of kstest.
+
+### change
+- chg function name to ksplot from kstest.
+
+## [0.0.2] - 2023-12-12
+
+### change
+- chg Q-QPlot and kstest
+- chg from one-side test to two side test.
+
 ## [0.0.1] - 2023-12-05
 
 ### Fixed

data/ext/num4normality/Normality.java

@@ -21,8 +21,11 @@ import java.io.IOException;
 
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.apache.commons.math3.distribution.NormalDistribution;
+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) {
         ChartPlot plot = new QQPlot();
@@ -30,13 +33,18 @@ public class Normality {
 
         plot.writeJPEG("qqplot.jpeg", chart, 800, 500);        
     }
-    public static void kstest(String dname, double[] xi) {
-        ChartPlot plot = new KSTest();
+    public static void ksplot(String dname, double[] xi) {
+        ChartPlot plot = new KSPlot();
         JFreeChart chart = plot.createChart(dname, xi);
 
-        plot.writeJPEG("kstest.jpeg", chart, 800, 500);        
+        plot.writeJPEG("ksplot.jpeg", chart, 800, 500);        
        
     }
+    public static boolean kstest(double[] xi) {
+        KSTest ks = new KSTest();
+
+        return ks.test(xi);
+    }
     public static boolean skewnesstest(double[] xi) {
         DAgostinosTest daigo = new SkewnessTest();
 
@@ -52,6 +60,10 @@ public class Normality {
     
 
     private interface ChartPlot {
+        /* フィールド */
+        static final double CLASS_MIN = -4.0;
+        static final double CLASS_MAX = 4.0;
+        /* メゾット */
         JFreeChart createChart(String dname, double[] xi);
         default void writeJPEG(String fname, JFreeChart chart, int width, int height) {
             File file = new File(fname);
@@ -70,30 +82,46 @@ public class Normality {
     // Q-Qplot
     private static class QQPlot implements ChartPlot {
         private DescriptiveStatistics stat = null;
-        private double m = 0.0;
-        private double sd = 0.0;
+        private NormalDistribution ndist = null;
         public QQPlot() {
             stat = new DescriptiveStatistics();
+            ndist = new NormalDistribution(0, 1);
         }
-        public JFreeChart createChart(String dname, double[] xi) {
+        private double[][] createData(double[] xi) {
+            int n = xi.length;
+            Arrays.sort(xi);
             Arrays.stream(xi).forEach(stat::addValue);
-            m = stat.getMean();     // 平均
-            sd = stat.getStandardDeviation();// 標準偏差
+            double sum = stat.getSum();
+            double[][] data = new double[n][2];
+            double p = 0.0;
 
-            XYPlot plot = createPlot(dname, xi);
+            for (int i = 0; i < n; i++) {
+                p += xi[i] / sum;
+                double x = 
+                    ndist.inverseCumulativeProbability(p * (i + 1.0) / (n + 1.0));
+
+                data[i][0] = x;
+                data[i][1] = xi[i];
+            }
+            return data;
+        }
+        public JFreeChart createChart(String dname, double[] xi) {
+            double[][] data = createData(xi);
+
+            XYPlot plot = createPlot(dname, data);
             /*--- 横軸 ---*/
             NumberAxis domainAxis = new NumberAxis("標準正規分布");
 
             plot.setDomainAxis(domainAxis);
             domainAxis.setLowerMargin(0.03);
             domainAxis.setUpperMargin(0.03);
-            domainAxis.setLowerBound(-4);
-            domainAxis.setUpperBound(4);
+            domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
+            domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
 
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
             return new JFreeChart("正規性の検定", plot);
         }
-        private XYPlot createPlot(String dname, double[] xi) {
+        private XYPlot createPlot(String dname, double[][] data) {
             XYItemRenderer renderer0 = new XYLineAndShapeRenderer(false, true);
             XYItemRenderer renderer1 = new XYLineAndShapeRenderer(true, false);
             XYToolTipGenerator toolTipGenerator = new StandardXYToolTipGenerator();
@@ -114,48 +142,44 @@ public class Normality {
             plot.setRangeAxis(valueAxis0);
 
             plot.setRenderer(0, renderer0);
-            plot.setDataset(0, createDataset0(dname, xi));
+            plot.setDataset(0, createDataset0(dname, data));
 
             plot.setRenderer(1, renderer1);
-            plot.setDataset(1, createDataset1());
+            plot.setDataset(1, createDataset1(data));
 
             return plot;
         }
-        private XYSeriesCollection createDataset0(String dname, double[] xi) {
-            double den = sd / Math.sqrt(xi.length);
-            XYSeries series = new XYSeries(dname);
+        private XYSeriesCollection createDataset0(String dname, double[][] data) {
+            XYSeries cu = new XYSeries(dname);
  
-            for (int i = 0; i < xi.length; i++) {
-                double x = (xi[i] - m) / den;
-
-                series.add(x, xi[i]);
+            for (int i = 0; i < data.length; i++) {
+                cu.add(data[i][0], data[i][1]);
             }
-            XYSeriesCollection data = new XYSeriesCollection();
+            XYSeriesCollection series = new XYSeriesCollection();
 
-            data.addSeries(series);
-            return data;
+            series.addSeries(cu);
+            return series;
         }
-        private XYSeriesCollection createDataset1() {
-            XYSeries series = new XYSeries("累積");
-            NormalDistribution ndist = new NormalDistribution(0, 1);
-
-            for (double p = 0.001; p < 1.0; p += 0.01) {
-                double x = ndist.inverseCumulativeProbability(p);
-
-                series.add(x, x * sd + m);
+        private XYSeriesCollection createDataset1(double[][] data) {
+            SimpleRegression simpleReg = new SimpleRegression(true);
+            XYSeries cu     = new XYSeries("累積");
+
+            simpleReg.addData(data);
+            double a = simpleReg.getSlope();
+            double b = simpleReg.getIntercept();
+     
+            for (double x = ChartPlot.CLASS_MIN; x < ChartPlot.CLASS_MAX; x += 0.01) {
+                double y = a * x + b;
+
+                cu.add(x, y);
             }
-
-            XYSeriesCollection data = new XYSeriesCollection();
-            data.addSeries(series);
-            return data;
+            XYSeriesCollection series = new XYSeriesCollection();
+            series.addSeries(cu);
+            return series;
         }
     }
     // コルモゴルフ・スミルノフ検定
-    private static class KSTest implements ChartPlot {
-        private NormalDistribution ndist = null;
-        public KSTest() {
-            ndist = new NormalDistribution(0, 1);
-        }
+    private static class KSPlot implements ChartPlot {
         public JFreeChart createChart(String dname, double[] xi) {
             NumberAxis domainAxis = new NumberAxis("標準正規分布");
             XYPlot plot = createPlot(dname, xi);
@@ -203,39 +227,57 @@ public class Normality {
             return plot;
         }
         private XYSeriesCollection createDataset0(String dname, double[] xi) {
+            int n = xi.length;
             Arrays.sort(xi);
             DescriptiveStatistics stat = new DescriptiveStatistics();
             Arrays.stream(xi).forEach(stat::addValue);
             double m = stat.getMean();     // 平均
             double sd = stat.getStandardDeviation();// 標準偏差
-            double den = sd / Math.sqrt(xi.length);
             double sum = stat.getSum();
             double p = 0.0;
 
-            XYSeries series = new XYSeries(dname);
-            for (int n = 0; n < xi.length; n++) {
-                double x = (xi[n] - m) / den;
-                
-                p += xi[n] / sum;
-                series.add(x, p);
+            XYSeries cu = new XYSeries(dname);
+            for (int i = 0; i < n; i++) {
+                double x = (xi[i] - m) / sd;
+
+                p += xi[i] / sum;
+                cu.add(x, p);
             }
-            XYSeriesCollection data = new XYSeriesCollection();
+            XYSeriesCollection series = new XYSeriesCollection();
 
-            data.addSeries(series);
-            return data;
+            series.addSeries(cu);
+            return series;
         }
         private XYSeriesCollection createDataset1() {
-            XYSeries series = new XYSeries("累積");
+            NormalDistribution ndist = new NormalDistribution(0, 1);
+            XYSeries cu = new XYSeries("累積p");
 
             for (double x = -4; x < 4; x += 0.01) {
                 double y = ndist.cumulativeProbability(x);
 
-                series.add(x, y);
+                cu.add(x, y);
             }
-            XYSeriesCollection data = new XYSeriesCollection();
+            XYSeriesCollection series = new XYSeriesCollection();
 
-            data.addSeries(series);
-            return data;
+            series.addSeries(cu);
+            return series;
+        }
+    }
+    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);
+
+            for (int i = 0; i < xi.length; i++) {
+                data[i] = (xi[i] - m) / sd; 
+            }
+            boolean ret = TestUtils.kolmogorovSmirnovTest(ndist, data, 0.05);
+            return ret;
         }
     }
     // タコスディーノ検定(歪度)
@@ -254,7 +296,7 @@ public class Normality {
         }
 
         public boolean test(double statistic, double a) {
-            double ua_2 = ndist.inverseCumulativeProbability(1.0 - a);
+            double ua_2 = ndist.inverseCumulativeProbability(1.0 - a / 2.0);
 
             return (Math.abs(statistic) > cnvb2tob2p(ua_2))
                 ? true : false;
@@ -285,7 +327,7 @@ public class Normality {
         }
         public boolean test(double statistic, double a) {
             boolean ret = false;
-            double ua_2 = ndist.inverseCumulativeProbability(1.0 - a);
+            double ua_2 = ndist.inverseCumulativeProbability(1.0 - a / 2.0);
             double b2p = cnvb2tob2p(statistic);
 
             double r_val = ua_2 + Math.sqrt(6.0 / n) * (ua_2 * ua_2 - 1.0);

data/lib/num4normality.rb

@@ -16,7 +16,7 @@ module Num4NormalityLib
         #   @param  [Array]  xi データ(double[])
         #   @return [void]  qqplot.jpegファイルを出力
         # @example
-        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209]
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
         #   Num4NormalityLib.qqplot("LDH", xi)
         #   => qqplot.jpeg
         # @note
@@ -24,28 +24,41 @@ module Num4NormalityLib
         def qqplot(dname, xi)
             Normality.qqplot(dname, xi.to_java(Java::double))
         end
-        # コルモゴルフ・スミルノフ検定
+        # コルモゴルフ・スミルノフ検定プロット(1標本)
         #
-        # @overload kstest(dname, xi)
+        # @overload ksplot(dname, xi)
         #   @param [String] dname データ名
         #   @param  [Array]  xi データ(double[])
-        #   @return [void]  kstest.jpegファイルを出力
+        #   @return [void]  ksplot.jpegファイルを出力
         # @example
-        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209]
-        #   Num4NormalityLib.kstest("LDH", xi)
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
+        #   Num4NormalityLib.ksplot("LDH", xi)
         #   => kstest.jpeg
         # @note
         #   グラフは、jfreechartを使用
-        def kstest(dname, xi)
-            Normality.kstest(dname, xi.to_java(Java::double))
+        def ksplot(dname, xi)
+            Normality.ksplot(dname, xi.to_java(Java::double))
         end
+        # コルモゴルフ・スミルノフ検定(1標本)
+        #
+        # @overload kstest(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.kstest(xi)
+        #   => false
+        def kstest(xi)
+            Normality.kstest(xi.to_java(Java::double))
+        end
+
         # タコスディーノ検定(歪度)
         #
         # @overload skewnesstest(xi)
         #   @param  [Array]  xi データ(double[])
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         # @example
-        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209]
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
         #   Num4NormalityLib.skewnesstest(xi)
         #   => false
         def skewnesstest(xi)
@@ -57,7 +70,7 @@ module Num4NormalityLib
         #   @param  [Array]  xi データ(double[])
         #   @return [boolean] 検定結果(true:棄却域内 false:棄却域外)
         # @example
-        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209]
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
         #   Num4NormalityLib.kurtosistest(xi)
         #   => false
         def kurtosistest(xi)

metadata

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