num4normality 0.0.4-java → 0.0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c526a9c71f5640706a0e7b57c5491b46bc93b7194ed7ef1c6031d49986d0a4
-  data.tar.gz: 51966044b28deae90af5f764bac62692243312cfcbd6a6013d4a54b8389d009f
+  metadata.gz: 9803b3bcb0408424c204ebda20e538aa178a2f35573e280dd222add412987cff
+  data.tar.gz: 1258e8ad4f82177478d2f35d689f56b4d8d58d1177f7a6f45896f05ee6c50189
 SHA512:
-  metadata.gz: f7c158d1d3f06e7390757264b06b70ce6081f8d57e4b6d84627a10ba834b1ae8422d38e18216e7faee81f9fc15d649b701af3f42131be504225e31c1131fdc55
-  data.tar.gz: f109895d5434021a9073180c4717b1db3fa081f9ed89d116d8883ff03318d9be3739f40227f8dc713f8fc576984497bd84889099f9aefec689ee12a60d01978e
+  metadata.gz: 16ad0542c142e6b74871df83ae43fa4ac62a9bd977e3bd466b9a520f849f0852460a1b71051b072c5de14b93a4b7530e2ef1821300b7b02303cfd1b307f0a43c
+  data.tar.gz: c49ca950c085da6760c1d0b171b7daad90354c7804e6521711e7469373a47aca58bec5d7fad47fb5d6c1a882c754ff389bdcae8e957fa93467cdc9db500ffa8a

data/ext/num4normality/Normality.java

@@ -4,6 +4,7 @@ import org.jfree.chart.ChartFactory;
 import org.jfree.data.xy.XYSeriesCollection;
 import org.jfree.data.xy.XYSeries;
 
+import org.jfree.chart.plot.CombinedDomainXYPlot;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.axis.NumberAxis;
 import org.jfree.chart.axis.ValueAxis;
@@ -29,18 +30,24 @@ 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();
-        JFreeChart chart = plot.createChart(dname, 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) {
-        ChartPlot plot = new KSPlot();
-        JFreeChart chart = plot.createChart(dname, 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();
+        JFreeChart chart = plot.createChart("Q-Q and コルモゴルフ・スミルノフ検定", dname, xi);
+
+        plot.writeJPEG("qqksplot.jpeg", chart, 1000, 800);        
+    }
     public static boolean kstest(double[] xi) {
         KSTest ks = new KSTest();
 
@@ -65,13 +72,15 @@ public class Normality {
         return daigo.test(x, 0.05);
     }
     
-
+    /*********************************/
+    /* interface define              */
+    /*********************************/
     private interface ChartPlot {
         /* フィールド */
         static final double CLASS_MIN = -4.0;
         static final double CLASS_MAX = 4.0;
         /* メゾット */
-        JFreeChart createChart(String dname, double[] xi);
+        JFreeChart createChart(String title, String dname, double[] xi);
         default void writeJPEG(String fname, JFreeChart chart, int width, int height) {
             File file = new File(fname);
             try {
@@ -81,43 +90,22 @@ public class Normality {
             }
         }
     }
+    private interface CreatePlot {
+        XYPlot createPlot(String dname, double[] xi);
+    }
     private interface DAgostinosTest {
         double calcTestStatistic(double[] xi);
         boolean test(double statistic, double a);
     }
-
+    /*********************************/
+    /* Class define                  */
+    /*********************************/
     // Q-Qplot
-    private static class QQPlot implements ChartPlot {
-        private DescriptiveStatistics stat = null;
-        private NormalDistribution ndist = null;
-        public QQPlot() {
-            stat = new DescriptiveStatistics();
-            ndist = new NormalDistribution(0, 1);
-        }
-        private double[][] createData(double[] xi) {
-            int n = xi.length;
-            Arrays.sort(xi);
-            Arrays.stream(xi).forEach(stat::addValue);
-            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 = 
-                    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);
+    private static class QQChartPlot implements ChartPlot {
+        public JFreeChart createChart(String title, String dname, double[] xi) {
+            XYPlot plot = createPlot(dname, xi);
             /*--- 横軸 ---*/
-            NumberAxis domainAxis = new NumberAxis("標準正規分布");
+            NumberAxis domainAxis = new NumberAxis("期待値");
 
             plot.setDomainAxis(domainAxis);
             domainAxis.setLowerMargin(0.03);
@@ -126,150 +114,231 @@ public class Normality {
             domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
 
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart("正規性の検定", plot);
+            return new JFreeChart(title, plot);
         }
-        private XYPlot createPlot(String dname, double[][] data) {
-            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 valueAxis0 = new NumberAxis("観測値");
-            plot.setRangeAxis(valueAxis0);
-
-            plot.setRenderer(0, renderer0);
-            plot.setDataset(0, createDataset0(dname, data));
-
-            plot.setRenderer(1, renderer1);
-            plot.setDataset(1, createDataset1(data));
+        private XYPlot createPlot(String dname, double[] xi) {
+            CreatePlot plotImpl = new QQPlot();
 
-            return plot;
+            return plotImpl.createPlot(dname, xi);
         }
-        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]);
+        public static class QQPlot implements CreatePlot {
+            private DescriptiveStatistics stat = null;
+            private NormalDistribution ndist = null;
+            public QQPlot() {
+                stat = new DescriptiveStatistics();
+                ndist = new NormalDistribution(0, 1);
             }
-            XYSeriesCollection series = new XYSeriesCollection();
+            private double[][] createData(double[] xi) {
+                int n = xi.length;
+                Arrays.sort(xi);
+                Arrays.stream(xi).forEach(stat::addValue);
+                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 = 
+                        ndist.inverseCumulativeProbability(p * (i + 1.0) / (n + 1.0));
+
+                    data[i][0] = x;
+                    data[i][1] = xi[i];
+                }
+                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 valueAxis0 = new NumberAxis("観測値");
+                plot.setRangeAxis(valueAxis0);
+
+                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("累積");
+                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();
+                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);
+                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;
             }
-            XYSeriesCollection series = new XYSeriesCollection();
-            series.addSeries(cu);
-            return series;
         }
     }
     // コルモゴルフ・スミルノフ検定
-    private static class KSPlot implements ChartPlot {
-        public JFreeChart createChart(String dname, double[] xi) {
-            NumberAxis domainAxis = new NumberAxis("標準正規分布");
+    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(-4);
-            domainAxis.setUpperBound(4);
+            domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
+            domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
             
             ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
-            return new JFreeChart("コルモゴルフ・スミルノフ検定", plot);
+            return new JFreeChart(title, plot);
         }
         private XYPlot createPlot(String dname, double[] 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 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, xi));
-
-            plot.setRenderer(1, renderer1);
-            plot.setDataset(1, createDataset1());
+            CreatePlot plotImpl = new KSPlot();
 
-            return plot;
+            return plotImpl.createPlot(dname, xi);
         }
-        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 sum = stat.getSum();
-            double p = 0.0;
+        public static class KSPlot implements CreatePlot {
+            private DescriptiveStatistics stat = null;
+            public KSPlot() {
+                stat = new DescriptiveStatistics();
+            }
+            private double[][] createData(double[] xi) {
+                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;
+                    data[i][0] = (xi[i] - m) / sd;
+                    data[i][1] = p;
+                }
+                return data;
+            }
+            public XYPlot createPlot(String dname, double[] 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 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, createData(xi)));
+
+                plot.setRenderer(1, renderer1);
+                plot.setDataset(1, createDataset1());
+
+                return plot;
+            }
+            private XYSeriesCollection createDataset0(String dname, double[][] data) {
+                XYSeries cu = new XYSeries(dname);
 
-            XYSeries cu = new XYSeries(dname);
-            for (int i = 0; i < n; i++) {
-                double x = (xi[i] - m) / sd;
+                for (int i = 0; i < data.length; i++) {
+                    cu.add(data[i][0], data[i][1]);
+                }
+                XYSeriesCollection series = new XYSeriesCollection();
 
-                p += xi[i] / sum;
-                cu.add(x, p);
+                series.addSeries(cu);
+                return series;
             }
-            XYSeriesCollection series = new XYSeriesCollection();
+            private XYSeriesCollection createDataset1() {
+                NormalDistribution ndist = new NormalDistribution(0, 1);
+                XYSeries cu = new XYSeries("累積p");
 
-            series.addSeries(cu);
-            return series;
-        }
-        private XYSeriesCollection createDataset1() {
-            NormalDistribution ndist = new NormalDistribution(0, 1);
-            XYSeries cu = new XYSeries("累積p");
+                for (double x = ChartPlot.CLASS_MIN; x < ChartPlot.CLASS_MAX; x += 0.01) {
+                    double y = ndist.cumulativeProbability(x);
 
-            for (double x = -4; x < 4; x += 0.01) {
-                double y = ndist.cumulativeProbability(x);
+                    cu.add(x, y);
+                }
+                XYSeriesCollection series = new XYSeriesCollection();
 
-                cu.add(x, y);
+                series.addSeries(cu);
+                return series;
             }
-            XYSeriesCollection series = new XYSeriesCollection();
+        }
+    }
+    // Q-QandKSplot
+    private static class QQKSChartPlot implements ChartPlot {
+        private CreatePlot plot0 = null;
+        private CreatePlot plot1 = null;
+        public QQKSChartPlot() {
+            plot0 = new QQChartPlot.QQPlot();
+            plot1 = new KSChartPlot.KSPlot();
+        }
+        public JFreeChart createChart(String title, String dname, double[] xi) {
+            XYPlot plot = createPlot(dname, xi);
+            
+            /*--- 横軸 ---*/
+            NumberAxis domainAxis = (NumberAxis)plot.getDomainAxis();
+            domainAxis.setLabel("期待値");
+            domainAxis.setLowerMargin(0.03);
+            domainAxis.setUpperMargin(0.03);
+            domainAxis.setLowerBound(ChartPlot.CLASS_MIN);
+            domainAxis.setUpperBound(ChartPlot.CLASS_MAX);
 
-            series.addSeries(cu);
-            return series;
+            ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
+            return new JFreeChart(title, plot);
         }
+        private XYPlot createPlot(String dname, double[] xi) {
+            CombinedDomainXYPlot plot = new CombinedDomainXYPlot();
+
+            plot.add(plot0.createPlot(dname, xi), 1);
+            plot.add(plot1.createPlot(dname, xi), 1);
+            return plot;
+        }
+
     }
+    // KS検定
     private static class KSTest {
         public boolean test(double[] xi) {
             double[] data = new double[xi.length];

data/lib/num4normality.rb

@@ -39,6 +39,9 @@ module Num4NormalityLib
         def ksplot(dname, xi)
             Normality.ksplot(dname, xi.to_java(Java::double))
         end
+        def qqksplot(dname, xi)
+            Normality.qqksplot(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.4
+  version: 0.0.6
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake