num4normality 0.0.1-java → 0.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6be725c6a9b20d5c4ca46f2543c96e293be67c9bcf2638816cb29331eadb8180
-  data.tar.gz: d18160bcab51e0760a2e4b533be709235f06d18b2150bb05cc4a9ef66a96179f
+  metadata.gz: b89f71cba5d40084df7feae50644d8df12b9501f486f9bdd3a534d2dce73a4df
+  data.tar.gz: fc2f02a141dd85f32834cae5c44607fd601b5b1e13902bda51cbbd4f4bddc98a
 SHA512:
-  metadata.gz: 1e9c798eaa8043b712da5940f361c8adffa82f4436cccc34843286baad3109d481354fea2a8f6f914f4f8205f2ff0393c31f47cdde589cdb408506257ba06491
-  data.tar.gz: 9f257c671f62f84c224a03641d802d7f275a6d042c80d336f4a666283def61b53a169527c6ec854676ff3344da8e60bcb2a0e6716b8afa8e31d700172d91fed2
+  metadata.gz: c7334b33fa778de4dd19980df1f5bf5933ef0c35e9b068775ecec0a091613007c9b25b4952ad5cb7714be3950f9a4bf640d7916a488424b65afef75857232b04
+  data.tar.gz: d9924ebad4a9a5315453fadc8f3ba8eec7583ae2d02356294a5b53bf9acbbbf4d26fbad3f0b651f216c862da1763fc2339b00fd994061c2a0b3fd7433794dec7

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [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,6 +21,7 @@ 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;
 public class Normality {
@@ -70,17 +71,33 @@ 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("標準正規分布");
 
@@ -93,7 +110,7 @@ public class Normality {
             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,40 +131,40 @@ 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 = -4.0; x < 4.0; 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;
         }
     }
     // コルモゴルフ・スミルノフ検定
@@ -203,39 +220,41 @@ 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;
+            XYSeries cu = new XYSeries(dname);
+            for (int i = 0; i < xi.length; i++) {
+                double x = (xi[i] - m) / sd;
+                p += xi[i] / sum;
+                double y = 
+                    ndist.inverseCumulativeProbability((i + 1.0) / (n + 1.0));
                 
-                p += xi[n] / sum;
-                series.add(x, p);
+                cu.add(Math.min(x, y), 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("累積");
+            XYSeries cu = new XYSeries("累積");
 
             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;
         }
     }
     // タコスディーノ検定(歪度)
@@ -254,7 +273,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 +304,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);

metadata

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