num4tststatistic 0.1.1-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8035ed8852a010c953dc1f89787acb056eb516252687ed2a52ff558fb588ebf6
-  data.tar.gz: 61ed13288b017bf0845b3cc3bf6807694eb655666a71126a4b31c9b67fe61aa4
+  metadata.gz: 53537fb9aa34673abd7db4fd6de0bdf1c32094c719d91cbec7be5ee030c8df14
+  data.tar.gz: 6e1f38c4918b3476dca195f41b5182e6122e96b6e1f86886708a54b8c318fa48
 SHA512:
-  metadata.gz: 6031d267ff6f19ad8c12bc397cde2a6ae8aa95b0280564039c7f5a0c5cc8485455663bb7fd168d9358d8a180c17776440e620190c80af322ff8c21e863f622bc
-  data.tar.gz: f2214a6320e064958b12e7afd72162edad09a8f355690215028126bd9f230ed52dff4e048ca064393b115375c9499cbb7af59ed788dce0b33fbd41c82070eca5
+  metadata.gz: a8c31d24cde63ff7e098de9d56bac19e3cc11d33ba611b5de7ae63de768b7af010d303d96529533b6c793cf0a7f248c594e4dbf6dcb5cc6473c52b1725fd52ae
+  data.tar.gz: 2d05cd849ef9e963cfd93c23da369250e304976a7b0a92d27ec7625a0bc7496a2520226eb2d28cb7f98c09cca514e45e3c65d0ed11836328d4f55b367ad6db59

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## [0.2.1] - 2024-01-07
+### add
+- add function of errbar.
+
 ## [0.1.1] - 2023-12-27
 
 ### add

data/Rakefile

@@ -1,7 +1,8 @@
 require  'rake/javaextensiontask'
 
+jars = Dir.glob("lib/*.jar")
 Rake::JavaExtensionTask.new(name='num4tststatistic')  do | ext |
   ext.release          = '11'
-  ext.classpath        = 'lib/commons-math3-3.6.1.jar'
+  ext.classpath        = jars.map { |x| File.expand_path x }.join ":"
 end
 task :default => [:compile]

data/ext/num4tststatistic/Outlier.java

@@ -0,0 +1,167 @@
+import org.jfree.chart.ChartFactory;
+import org.jfree.chart.StandardChartTheme;
+import org.jfree.chart.JFreeChart;
+import org.jfree.chart.StandardChartTheme;
+import org.jfree.chart.plot.CategoryPlot;
+import org.jfree.data.statistics.BoxAndWhiskerCategoryDataset;
+import org.jfree.data.statistics.DefaultBoxAndWhiskerCategoryDataset;
+import org.jfree.data.statistics.BoxAndWhiskerCalculator;
+import org.jfree.data.statistics.BoxAndWhiskerItem;
+import org.jfree.data.category.CategoryDataset;
+import org.jfree.data.category.DefaultCategoryDataset;
+import org.jfree.chart.renderer.category.BoxAndWhiskerRenderer;
+import org.jfree.chart.labels.BoxAndWhiskerToolTipGenerator;
+import org.jfree.chart.plot.PlotOrientation;
+import org.jfree.chart.plot.DatasetRenderingOrder;
+import org.jfree.chart.axis.CategoryAxis;
+import org.jfree.chart.axis.NumberAxis;
+import org.jfree.chart.renderer.category.LineAndShapeRenderer;
+import org.jfree.chart.labels.StandardCategoryToolTipGenerator;
+
+import org.jfree.chart.ChartUtils;
+import java.io.File;
+import java.io.IOException;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
+import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
+public class Outlier {
+    private static Outlier outlier = new Outlier();
+    public static Outlier getInstance() {
+        return outlier;
+    }
+    public double grubbs(double[] xi, double xk) {
+        Grubbs g = new Grubbs();
+
+        return g.calcStatistics(xi, xk);
+    }
+    
+    public void errbar(String dname, double[] xi) {
+        ChartPlot plot = new ErrorBarChartPlot();
+        JFreeChart chart = plot.createChart("エラーバー", dname, xi);
+
+        plot.writeJPEG("errbar.jpeg", chart, 800, 500);        
+        
+    }
+    /*********************************/
+    /* interface define              */
+    /*********************************/
+    private interface ChartPlot {
+        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 {
+                ChartUtils.saveChartAsJPEG(file, chart, width, height);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    private interface CreatePlot {
+        CategoryPlot createPlot(String dname, double[] xi);
+    }
+    /*********************************/
+    /* Class define                  */
+    /*********************************/
+    // 
+    private class Grubbs {
+        private SummaryStatistics stat = new SummaryStatistics();
+        public double calcStatistics(double[] xi, double xk) {
+            Arrays.stream(xi).forEach(stat::addValue);
+            double m = stat.getMean();     // 平均
+            double sd = stat.getStandardDeviation();// 標準偏差
+            double min = stat.getMin();
+            double max = stat.getMax();
+            double t = 0.0;
+
+            if (xk == min) { t = (m - xk) / sd; }
+            if (xk == max) { t = (xk - m) / sd; }
+            return t;
+        }
+    }
+    // error bar
+    private class ErrorBarChartPlot implements ChartPlot{
+        public JFreeChart createChart(String title, String dname, double[] xi) {
+            CategoryPlot plot = createPlot(dname, xi);
+
+            ChartFactory.setChartTheme(StandardChartTheme.createLegacyTheme());
+            JFreeChart chart = new JFreeChart(title, plot);
+
+            ChartUtils.applyCurrentTheme(chart);
+            return chart;
+        }
+        private CategoryPlot createPlot(String dname, double[] xi) {
+            CreatePlot plotImpl = new ErrorBarPlot();
+
+            return plotImpl.createPlot(dname, xi);
+        }
+        public class ErrorBarPlot implements CreatePlot {
+            public CategoryPlot createPlot(String dname, double[] xi) {
+                BoxAndWhiskerRenderer renderer0 = new BoxAndWhiskerRenderer();
+                LineAndShapeRenderer renderer1 = new LineAndShapeRenderer(false, true);
+
+                renderer0.setDefaultToolTipGenerator(new BoxAndWhiskerToolTipGenerator());
+                renderer0.setMaximumBarWidth(0.2);
+                renderer1.setDefaultToolTipGenerator(
+                    new StandardCategoryToolTipGenerator());
+ 
+                CategoryPlot plot = new CategoryPlot();
+                plot.setOrientation(PlotOrientation.VERTICAL);
+                plot.mapDatasetToRangeAxis(0,0);
+                plot.mapDatasetToRangeAxis(1,0);
+	        plot.setDatasetRenderingOrder(DatasetRenderingOrder.FORWARD);
+
+                /*--- 横軸 ---*/
+                CategoryAxis categoryAxis = new CategoryAxis();
+                plot.setDomainAxis(categoryAxis);
+
+                /*--- 縦軸 ---*/
+                NumberAxis valueAxis = new NumberAxis();
+                valueAxis.setAutoRangeIncludesZero(false);
+                plot.setRangeAxis(valueAxis);
+                
+                plot.setRenderer(0, renderer0);
+                plot.setDataset(0, createDataset0(dname, xi));
+                plot.setRenderer(1, renderer1);
+                plot.setDataset(1, createDataset1(dname, xi));
+
+                return plot;
+            }
+            private CategoryDataset createDataset0(String dname, double[] xi) {
+                DefaultBoxAndWhiskerCategoryDataset data = 
+                    new DefaultBoxAndWhiskerCategoryDataset();
+                List<Double> values = new ArrayList<Double>();
+                Arrays.stream(xi).forEach(values::add);
+
+                BoxAndWhiskerItem item = 
+                    BoxAndWhiskerCalculator.calculateBoxAndWhiskerStatistics(values);
+
+                data.add(item, dname, "dt1");
+                return data;
+            }
+            private CategoryDataset createDataset1(String dname, double[] xi) {
+                DefaultCategoryDataset data = new DefaultCategoryDataset();
+                SummaryStatistics stat = new SummaryStatistics();
+                List<Double> values = new ArrayList<Double>();
+
+                Arrays.stream(xi).forEach(stat::addValue);
+                Arrays.stream(xi).forEach(values::add);
+
+                BoxAndWhiskerItem item = 
+                    BoxAndWhiskerCalculator.calculateBoxAndWhiskerStatistics(values);
+                double minQ = ((Double)item.getMinOutlier()).doubleValue();
+                double min = stat.getMin();
+                double maxQ = ((Double)item.getMaxOutlier()).doubleValue();
+                double max = stat.getMax();
+
+                if (min < minQ) { data.addValue(min, dname, "dt1"); };
+                if (max > maxQ) { data.addValue(max, dname, "dt1"); };
+                return data;
+            }
+        }
+    }
+}
+
+

data/lib/num4tststatistic.rb

@@ -1,8 +1,9 @@
 require 'java'
 require 'num4tststatistic.jar'
 require 'commons-math3-3.6.1.jar'
+require 'jfreechart-1.5.4.jar'
 
-java_import 'TstStatistic'
+java_import 'Outlier'
 java_import 'ParametrixTest'
 java_import 'NonParametrixTest'
 
@@ -319,7 +320,10 @@ module Num4TstStatisticLib
             return @nonParamTest.ks2test(xi1.to_java(Java::double), xi2.to_java(Java::double), a)
         end
     end
-    class << self
+    class OutlierLib
+        def initialize
+            @outlier = Outlier.getInstance()
+        end
         # グラプス・スミルノフの外れ値の検定量
         #
         # @overload grubbs(xi, xk)
@@ -333,7 +337,22 @@ module Num4TstStatisticLib
         # @note
         #   外れ値の検定に従う
         def grubbs(xi, xk)
-            return TstStatistic.grubbs(xi.to_java(Java::double), xk)
+            return @outlier.grubbs(xi.to_java(Java::double), xk)
+        end
+        # エラーバー出力
+        #
+        # @overload errbar(dname, xi)
+        #   @param [String] dname データ名
+        #   @param [Array] xi xiのデータ(double[])
+        #   @return [void]  errbar.jpegファイルを出力
+        # @example
+        #   xi = [3.4, 3.5, 3.3, 2.2, 3.3, 3.4, 3.6, 3.2]
+        #   Num4TstStatisticLib.grubbs("LDH", xi)
+        #   => errbar.jpeg
+        # @note
+        #   グラフは、jfreechartを使用
+        def errbar(dname, xi)
+            return @outlier.errbar(dname, xi.to_java(Java::double))
         end
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4tststatistic
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-27 00:00:00.000000000 Z
+date: 2024-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -62,9 +62,11 @@ files:
 - LICENSE
 - Rakefile
 - ext/num4tststatistic/NonParametrixTest.java
+- ext/num4tststatistic/Outlier.java
 - ext/num4tststatistic/ParametrixTest.java
-- ext/num4tststatistic/TstStatistic.java
 - lib/commons-math3-3.6.1.jar
+- lib/jcommon-1.0.23.jar
+- lib/jfreechart-1.5.4.jar
 - lib/num4tststatistic.rb
 homepage: http://github.com/siranovel/num4tststatistic
 licenses:

data/ext/num4tststatistic/TstStatistic.java

@@ -1,21 +0,0 @@
-import java.util.Arrays;
-
-import org.apache.commons.math3.stat.descriptive.SummaryStatistics;
-public class TstStatistic {
-    public static double grubbs(double[] xi, double xk) {
-        SummaryStatistics stat = new SummaryStatistics();
-
-        Arrays.stream(xi).forEach(stat::addValue);
-        double m = stat.getMean();     // 平均
-        double sd = stat.getStandardDeviation();// 標準偏差
-        double min = stat.getMin();
-        double max = stat.getMax();
-        double t = 0.0;
-
-        if (xk == min) { t = (m - xk) / sd; }
-        if (xk == max) { t = (xk - m) / sd; }
-        return t;
-    }
-}
-
-