num4normality 0.0.6-java → 0.0.8-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9803b3bcb0408424c204ebda20e538aa178a2f35573e280dd222add412987cff
-  data.tar.gz: 1258e8ad4f82177478d2f35d689f56b4d8d58d1177f7a6f45896f05ee6c50189
+  metadata.gz: 6bdb8267fad8c0c825bffbdc4ce48f03b5f7044b42c7b4575acd0c3bd1d24485
+  data.tar.gz: '0299ec982c1d8c30ee2613f2511d13125c95fb3113ccc48e630ad9496485f92b'
 SHA512:
-  metadata.gz: 16ad0542c142e6b74871df83ae43fa4ac62a9bd977e3bd466b9a520f849f0852460a1b71051b072c5de14b93a4b7530e2ef1821300b7b02303cfd1b307f0a43c
-  data.tar.gz: c49ca950c085da6760c1d0b171b7daad90354c7804e6521711e7469373a47aca58bec5d7fad47fb5d6c1a882c754ff389bdcae8e957fa93467cdc9db500ffa8a
+  metadata.gz: f5d1bb2fb5de97f2480715cff1b0183ff22cf7f04f2d776050edf32f49377bd9dce4b6d48eacdbcde1fe1a67118dcc1e21b1232d84f582a9f65fa695528ca9f5
+  data.tar.gz: 15d6d2d3bbd2b18361064577273fdb66f43f906ebfa87f9671cc31e9a1a11e3203f16b3c828fe828c87aacfcb9be3663370e6249992bf222eb1265109ea6c038

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## Unreleased
 
+## [0.0.8] - 2023-12-30
+
+### Fixed
+- fix fuction of ppplot.
+
+## [0.0.7] - 2023-12-26
+
+### add
+- add function of ppplot.
+- add function of ppksplot.
+
+## [0.0.6] - 2023-12-23
+
+### add
+- add function of qqksplot.
+
 ## [0.0.4] - 2023-12-21
 
 ### add

data/ext/num4normality/Normality.java

@@ -5,6 +5,7 @@ import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.data.xy.XYSeries;
 
 import org.jfree.chart.plot.CombinedDomainXYPlot;
+import org.jfree.chart.plot.CombinedRangeXYPlot;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.ValueAxis;
@@ -21,6 +22,7 @@ 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.stat.regression.SimpleRegression;
@@ -44,10 +46,23 @@ public class Normality {
     }
     public static void qqksplot(String dname, double[] xi) {
          ChartPlot plot = new QQKSChartPlot();
-        JFreeChart chart = plot.createChart("Q-Q and コルモゴルフ・スミルノフ検定", dname, xi);
+        JFreeChart chart = plot.createChart("Q-Q and コルモゴルフ・スミルノフ", dname, xi);
 
         plot.writeJPEG("qqksplot.jpeg", chart, 1000, 800);        
     }
+    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) {
+        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) {
         KSTest ks = new KSTest();
 
@@ -104,14 +119,6 @@ public class Normality {
     private static class QQChartPlot implements ChartPlot {
         public JFreeChart createChart(String title, String dname, double[] xi) {
             XYPlot plot = createPlot(dname, xi);
-            /*--- 横軸 ---*/
-            NumberAxis domainAxis = new NumberAxis("期待値");
-
-            plot.setDomainAxis(domainAxis);
-            domainAxis.setLowerMargin(0.03);
-            domainAxis.setUpperMargin(0.03);
-            domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
-            domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
 
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
             return new JFreeChart(title, plot);
@@ -122,13 +129,10 @@ public class Normality {
             return plotImpl.createPlot(dname, xi);
         }
         public static class QQPlot implements CreatePlot {
-            private DescriptiveStatistics stat = null;
-            private NormalDistribution ndist = null;
-            public QQPlot() {
-                stat = new DescriptiveStatistics();
-                ndist = new NormalDistribution(0, 1);
-            }
             private double[][] createData(double[] xi) {
+                DescriptiveStatistics stat = new DescriptiveStatistics();
+                NormalDistribution ndist = new NormalDistribution(0, 1);
+
                 int n = xi.length;
                 Arrays.sort(xi);
                 Arrays.stream(xi).forEach(stat::addValue);
@@ -163,6 +167,15 @@ public class Normality {
                 plot.mapDatasetToRangeAxis(1,0);
 	        plot.setDatasetRenderingOrder(DatasetRenderingOrder.FORWARD);
 
+                /*--- 横軸 ---*/
+                NumberAxis domainAxis = new NumberAxis("期待値");
+
+                plot.setDomainAxis(domainAxis);
+                domainAxis.setLowerMargin(0.03);
+                domainAxis.setUpperMargin(0.03);
+                domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
+                domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
+
                 /*--- 縦軸 ---*/
                 NumberAxis valueAxis0 = new NumberAxis("観測値");
                 plot.setRangeAxis(valueAxis0);
@@ -208,15 +221,7 @@ public class Normality {
     // コルモゴルフ・スミルノフ検定
     private static class KSChartPlot implements ChartPlot {
         public JFreeChart createChart(String title, String dname, double[] xi) {
-            /*--- 横軸 ---*/
-            NumberAxis domainAxis = new NumberAxis("期待値");
             XYPlot plot = createPlot(dname, xi);
-
-            plot.setDomainAxis(domainAxis);
-            domainAxis.setLowerMargin(0.03);
-            domainAxis.setUpperMargin(0.03);
-            domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
-            domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
             
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
             return new JFreeChart(title, plot);
@@ -227,23 +232,20 @@ public class Normality {
             return plotImpl.createPlot(dname, xi);
         }
         public static class KSPlot implements CreatePlot {
-            private DescriptiveStatistics stat = null;
-            public KSPlot() {
-                stat = new DescriptiveStatistics();
-            }
             private double[][] createData(double[] xi) {
+                DescriptiveStatistics stat = new DescriptiveStatistics();
+
                 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;
@@ -264,6 +266,15 @@ public class Normality {
                 plot.mapDatasetToRangeAxis(1,0);
 	        plot.setDatasetRenderingOrder(DatasetRenderingOrder.FORWARD);
 
+                /*--- 横軸 ---*/
+                NumberAxis domainAxis = new NumberAxis("期待値");
+                plot.setDomainAxis(domainAxis);
+
+                domainAxis.setLowerMargin(0.03);
+                domainAxis.setUpperMargin(0.03);
+                domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
+                domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
+
                 /*--- 縦軸 ---*/
                 NumberAxis valueAxis0 = new NumberAxis("確率");
                 plot.setRangeAxis(valueAxis0);
@@ -307,53 +318,175 @@ public class Normality {
             }
         }
     }
-    // Q-QandKSplot
+    // Q-Q and KSplot
     private static class QQKSChartPlot implements ChartPlot {
-        private CreatePlot plot0 = null;
-        private CreatePlot plot1 = null;
-        public QQKSChartPlot() {
-            plot0 = new QQChartPlot.QQPlot();
-            plot1 = new KSChartPlot.KSPlot();
-        }
+        private CreatePlot plot0 = new QQChartPlot.QQPlot();
+        private CreatePlot plot1 = new KSChartPlot.KSPlot();
         public JFreeChart createChart(String title, String dname, double[] xi) {
             XYPlot plot = createPlot(dname, xi);
             
+            ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
+            return new JFreeChart(title, plot);
+        }
+        private XYPlot createPlot(String dname, double[] xi) {
             /*--- 横軸 ---*/
-            NumberAxis domainAxis = (NumberAxis)plot.getDomainAxis();
+            NumberAxis domainAxis = new NumberAxis("期待値");
+
+            CombinedDomainXYPlot plot = new CombinedDomainXYPlot(domainAxis);
             domainAxis.setLabel("期待値");
             domainAxis.setLowerMargin(0.03);
             domainAxis.setUpperMargin(0.03);
             domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
             domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
 
+            plot.add(plot0.createPlot(dname, xi), 1);
+            plot.add(plot1.createPlot(dname, xi), 1);
+            return plot;
+        }
+
+    }
+    // P-Pplot
+    private static class PPChartPlot implements ChartPlot {
+        public JFreeChart createChart(String title, String dname, double[] xi) {
+            XYPlot plot = createPlot(dname, xi);
+
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
             return new JFreeChart(title, plot);
         }
         private XYPlot createPlot(String dname, double[] xi) {
-            CombinedDomainXYPlot plot = new CombinedDomainXYPlot();
+            CreatePlot plotImpl = new PPPlot();
 
-            plot.add(plot0.createPlot(dname, xi), 1);
-            plot.add(plot1.createPlot(dname, xi), 1);
-            return plot;
+            return plotImpl.createPlot(dname, xi);
         }
+        public static class PPPlot implements CreatePlot {
+            private double[][] createData(double[] xi) {
+                DescriptiveStatistics stat = new DescriptiveStatistics();
+                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 sum = stat.getSum();
+                double p = 0.0;
+                double z[] = StatUtils.normalize(xi);
+
+                for (int i = 0; i < n; i++) {
+                    p += xi[i] / sum;
+
+                    data[i][0] = ndist.cumulativeProbability(z[i]);
+                    data[i][1] = p;
+                }
+                return data;
+            }
+            public XYPlot createPlot(String dname, double[] xi) {
+                double[][] data = createData(xi);
+                XYItemRenderer renderer0 = new XYLineAndShapeRenderer(false, true);
+                XYItemRenderer renderer1 = new XYLineAndShapeRenderer(true, false);
+                XYToolTipGenerator toolTipGenerator = new StandardXYToolTipGenerator();
+
+                renderer0.setDefaultToolTipGenerator(toolTipGenerator);
+                renderer0.setURLGenerator(null);
+                renderer1.setDefaultToolTipGenerator(toolTipGenerator);
+                renderer1.setURLGenerator(null);
+
+                XYPlot plot = new XYPlot();
+                plot.setOrientation(PlotOrientation.VERTICAL);
+                plot.mapDatasetToRangeAxis(0,0);
+                plot.mapDatasetToRangeAxis(1,0);
+	        plot.setDatasetRenderingOrder(DatasetRenderingOrder.FORWARD);
+
+                /*--- 横軸 ---*/
+                NumberAxis domainAxis = new NumberAxis("観測累積確率");
+
+                plot.setDomainAxis(0, domainAxis);
+                domainAxis.setLowerMargin(0.03);
+                domainAxis.setUpperMargin(0.03);
+                domainAxis.setLowerBound(0.0);
+                domainAxis.setUpperBound(1.0);
+                domainAxis.setTickUnit(new NumberTickUnit(0.1));
+                domainAxis.setNumberFormatOverride(new DecimalFormat("0.0#"));
+                /*--- 縦軸 ---*/
+                NumberAxis valueAxis0 = new NumberAxis("予測累積確率");
+                plot.setRangeAxis(valueAxis0);
+                valueAxis0.setLowerBound(0);
+                valueAxis0.setUpperBound(1);
+                valueAxis0.setTickUnit(new NumberTickUnit(0.1));
+                valueAxis0.setNumberFormatOverride(new DecimalFormat("0.0#"));
+
+                plot.setRenderer(0, renderer0);
+                plot.setDataset(0, createDataset0(dname, data));
+
+                plot.setRenderer(1, renderer1);
+                plot.setDataset(1, createDataset1(data));
+                return plot;
+            }
+            private XYSeriesCollection createDataset0(String dname, double[][] data) {
+                XYSeries cu = new XYSeries(dname);
+
+                for (int i = 0; i < data.length; i++) {
+                    cu.add(data[i][0], data[i][1]);
+                }
+                XYSeriesCollection series = new XYSeriesCollection();
+
+                series.addSeries(cu);
+                return series;
+            }
+            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 series = new XYSeriesCollection();
+                series.addSeries(cu);
+                return series;
+            }
+            
+        }
+    }
+    // P-P and KSplot
+    private static class PPKSChartPlot implements ChartPlot {
+        private CreatePlot plot0 = new PPChartPlot.PPPlot();
+        private CreatePlot plot1 = new KSChartPlot.KSPlot();
+        public JFreeChart createChart(String title, String dname, double[] xi) {
+            XYPlot plot = createPlot(dname, xi);
+
+            ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
+            return new JFreeChart(title, plot);
+        }
+        private XYPlot createPlot(String dname, double[] xi) {
+            /*--- 縦軸 ---*/
+            NumberAxis rangeAxis = new NumberAxis("予測累積確率");
+            CombinedRangeXYPlot plot = new CombinedRangeXYPlot(rangeAxis);
+            rangeAxis.setLowerMargin(0.03);
+            rangeAxis.setUpperMargin(0.03);
+            rangeAxis.setLowerBound(0.0);
+            rangeAxis.setUpperBound(1.0);
+            rangeAxis.setTickUnit(new NumberTickUnit(0.1));
+            rangeAxis.setNumberFormatOverride(new DecimalFormat("0.0#"));
+
+            plot.add(plot0.createPlot(dname, xi), 2);
+            plot.add(plot1.createPlot(dname, xi), 3);
+
+            return plot;
+        }
     }
     // 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);
         }
     }
     // タコスディーノ検定(歪度)

data/lib/num4normality.rb

@@ -33,15 +33,57 @@ 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))
         end
+        # Q-Q and コルモゴルフ・スミルノフ検定プロット(1標本)
+        #
+        # @overload qqksplot(dname, xi)
+        #   @param [String] dname データ名
+        #   @param  [Array]  xi データ(double[])
+        #   @return [void]  qqksplot.jpegファイルを出力
+        # @example
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
+        #   Num4NormalityLib.qqksplot("LDH", xi)
+        #   => qqksplot.jpeg
+        # @note
+        #   グラフは、jfreechartを使用
         def qqksplot(dname, xi)
             Normality.qqksplot(dname, xi.to_java(Java::double))
         end
+        # P-Pプロット
+        #
+        # @overload ppplot(dname, xi)
+        #   @param [String] dname データ名
+        #   @param  [Array]  xi データ(double[])
+        #   @return [void]  ppplot.jpegファイルを出力
+        # @example
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
+        #   Num4NormalityLib.ppplot("LDH", xi)
+        #   => ppplot.jpeg
+        # @note
+        #   グラフは、jfreechartを使用
+        def ppplot(dname, xi)
+            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]  ppksplot.jpegファイルを出力
+        # @example
+        #   xi = [320, 240, 402, 325, 440, 286, 362, 281, 560, 212, 198, 209, 374]
+        #   Num4NormalityLib.ppksplot("LDH", xi)
+        #   => ppksplot.jpeg
+        # @note
+        #   グラフは、jfreechartを使用
+        def ppksplot(dname, xi)
+            Normality.ppksplot(dname, xi.to_java(Java::double))
+        end
         # コルモゴルフ・スミルノフ検定(1標本)
         #
         # @overload kstest(xi)

metadata

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