num4normality 0.0.6-java → 0.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9803b3bcb0408424c204ebda20e538aa178a2f35573e280dd222add412987cff
-  data.tar.gz: 1258e8ad4f82177478d2f35d689f56b4d8d58d1177f7a6f45896f05ee6c50189
+  metadata.gz: d445077e57757b20233ab78457bdd1b11a3b1851a8341ab7e28d778ef180d68d
+  data.tar.gz: 1e7b9c47b46bffbc4ae6dafa164b6f2b6d3c0707b6ad4478267740248b098498
 SHA512:
-  metadata.gz: 16ad0542c142e6b74871df83ae43fa4ac62a9bd977e3bd466b9a520f849f0852460a1b71051b072c5de14b93a4b7530e2ef1821300b7b02303cfd1b307f0a43c
-  data.tar.gz: c49ca950c085da6760c1d0b171b7daad90354c7804e6521711e7469373a47aca58bec5d7fad47fb5d6c1a882c754ff389bdcae8e957fa93467cdc9db500ffa8a
+  metadata.gz: 5bb019e46c2b0deae1b6f2e2e5776926621620fd787903a3fec119bece63b04e64b979f3c5b3de08883a487fb6ec503d49f43c7acc229b1ab33134c24e5d1179
+  data.tar.gz: 8f60222acffc237d2961b909209182cdf9ef2e7fecad9248553be02853c9690cfeefef425f49a4ad5bdff5a0e733d3bd9a434b74b09ef934d94f2ac3f851345b

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## Unreleased
 
+## [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;
@@ -44,10 +45,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 +118,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 +128,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 +166,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 +220,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,11 +231,9 @@ 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);
@@ -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,36 +318,169 @@ 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;
+                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;
+
+                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][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 {

data/lib/num4normality.rb

@@ -39,9 +39,51 @@ module Num4NormalityLib
         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]  ppplot.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.7
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake