num4regana 0.0.1-java → 0.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 616a5ce4aa14748f31750e7b1c2e69ca9af26295e7a173a8454ff9b3bc83cbfe
-  data.tar.gz: 74b2370bb501a69ef6546840d3ed0b61315e13ef35f584d5dbe3f2f38725cbb2
+  metadata.gz: e3b63549f4e9c8d1779a21f7247bae8c034c4066e9907b53c76281c84c18c114
+  data.tar.gz: 19bd91c1939a3055b03a5bf35b516e09f31360cdeb227baab648c5277f843de9
 SHA512:
-  metadata.gz: 7133ab852f61abbcb0e93bbc1be555bcfe16dfab0751ff1026be21dc8a46d829b3d03ba94313a7a196a0f385b7dbe01a6cb16d4678337bb063662e3faac88b43
-  data.tar.gz: a9851b753e8bf686a1a5bccc5dc392dc229822e51e47a3b1b82c8f1f76dbaf8629c04ecc825679aee250ff1225a7cf9ab6ed2f774f61e927f32fcb58ba83e7ee
+  metadata.gz: ed0417b5fd2374d6ce4b3253484f532c40675fdf920e0bd7f10ec65e1c14ff7d1cf8be8fc748d9c68fe173613e67c4bcfa97235c43dbd4a9a65533a7a5fa38f1
+  data.tar.gz: a630e9d0ea9b931542b439617f9b28b38f1b0ac6e857ae95538cb04da60407af0882bf2654ec444abcbe150109c5e40bfcaf372d8514f5f621eb9af23cdb13fc

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## [0.0.3] - 2024-09-05
+
+### add
+- add GLM
+  logistic regression analystis
+  poisson regression analystis
+
+## [0.0.2] - 2024-08-08
+
+### fix
+- add function of equal variances in OLSMultRegAnaLib
+
 ## [0.0.1] - 2024-06-27
 
 ### Fixed

data/ext/num4regana/LogitRegAna.java

@@ -0,0 +1,82 @@
+public class LogitRegAna {
+    private static LogitRegAna regana = new LogitRegAna();
+    public static LogitRegAna getInstance() {
+        return regana;
+    }
+    public LineReg nonLineRegAna(double[] yi, double xij[][]) {
+        NonLineRegAna line = new NonLineRegAna();
+
+        return line.nonLineRegAna(yi, xij);
+    }
+    /*********************************/
+    /* interface define              */
+    /*********************************/
+    /*********************************/
+    /* class define                  */
+    /*********************************/
+    public class LineReg {
+        private double a   = 0.0;
+        private double[] b = null;
+        public LineReg(double[] b) {
+            this.a = b[0];
+            this.b = new double[b.length - 1];
+            for (int i = 0; i < this.b.length; i++) {
+                this.b[i] = b[i + 1];
+            }
+        }
+        public double getIntercept() {
+            return a;
+        }
+        public double[] getSlope() {
+            return b;
+        }
+    }
+    private class NonLineRegAna {
+        private final double eta = 0.001;
+        private final int num = 10000;
+        public LineReg nonLineRegAna(double[] yi, double[][] xij) {
+            double[] b = new double[1 + xij[0].length];
+            
+            for(int i = 0; i < b.length; i++) {
+                b[i] = 0.0;
+            }
+            for  (int i = 0; i < num; i++) {
+                b = grand_metod(yi, b, xij);
+            }
+            return new LineReg(b);
+        }
+        // q = b0 + b1 * x0
+        private double rereion(double[] b, double[] xi) {
+            double ret = b[0];
+
+            for(int i = 0; i < xi.length; i++) {
+                ret += b[i + 1] * xi[i];
+            }
+            return ret;
+        }
+        // p = 1 / (1 + exp( -q))
+        private double sigmoid(double q) {
+            return 1.0 / (1.0 + Math.exp(-1.0 * q));
+        }
+        private double[] grand_metod(double[] yi, double[] b, double[][] xij) {
+            double e0 = 0.0;
+            double[] en = new double[xij[0].length];
+
+            for(int i = 0; i < yi.length; i++) {
+                double q = rereion(b, xij[i]);
+                double p = sigmoid(q);
+
+                e0 += (yi[i] - p);
+                for(int j = 0; j < en.length; j++) {                
+                    en[j] += (yi[i] - p) * xij[i][j];
+                }
+            }
+            b[0] = b[0] + eta * e0;
+            for(int j = 0; j < en.length; j++) {
+                b[1 + j] += eta * en[j];
+            }
+            return b;
+        }
+    }
+}
+

data/ext/num4regana/MultRegAna.java

@@ -0,0 +1,205 @@
+import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression;
+import org.apache.commons.math3.stat.regression.GLSMultipleLinearRegression;
+import org.apache.commons.math3.stat.correlation.Covariance;
+import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
+import java.util.Arrays;
+import org.apache.commons.math3.distribution.ChiSquaredDistribution;
+
+public class MultRegAna {
+    private final double A = 0.05;
+    private static MultRegAna regana = new MultRegAna();
+    public static MultRegAna getInstance() {
+        return regana;
+    }
+    public LineReg lineRegAna(double[] yi, double xij[][]) {
+        LineRegAna line = createLineRegAna(yi, xij);
+
+        return line.lineRegAna(yi, xij);
+    }
+    public double getR2(double[] yi, double xij[][]) {
+        LineRegAna line = createLineRegAna(yi, xij);
+
+        return line.getR2(yi, xij);
+    }
+    public double getAdjR2(double[] yi, double xij[][]) {
+        LineRegAna line = createLineRegAna(yi, xij);
+
+        return line.getAdjR2(yi, xij);
+    }
+    private LineRegAna createLineRegAna(double[] yi, double xij[][]) {
+        double[][] data = createData(yi, xij);
+
+        // 等分散性の検定
+        if (false == bartletTest(data)) {  // 等分散性
+            return new OLSMultRegAna();
+        }
+        else {                             // 
+            return new GLSMultRegAna(data);
+        }
+    }
+    private double[][] createData(double[] yi, double xij[][]) {
+        double[][] data = new double[yi.length][1 + xij[0].length];
+
+        for (int i = 0; i < yi.length; i++) {
+            data[i][0] = yi[i];
+            System.arraycopy(xij[i], 0, data[i], 1, xij[0].length);
+        }
+        return data;
+    }
+    private boolean bartletTest(double data[][]) {
+        OneWayAnovaTest anova = new BartletTest();
+        double statistic = anova.calcTestStatistic(data);
+
+        return anova.execute_test(statistic, A);
+    }
+    /*********************************/
+    /* interface define              */
+    /*********************************/
+    private interface LineRegAna {
+        // 最小２乗法
+        LineReg lineRegAna(double[] yi, double xij[][]);
+        // 決定係数取得
+        double getR2(double[] yi, double xij[][]);
+        // 自由度調整済み決定係数
+        double getAdjR2(double[] yi, double xij[][]);
+    }
+    private interface OneWayAnovaTest {
+        double calcTestStatistic(double[][] xi);
+        boolean execute_test(double statistic, double a);
+    }
+    /*********************************/
+    /* class define                  */
+    /*********************************/
+    public class LineReg {
+        private double a   = 0.0;
+        private double[] b = null;
+        public LineReg(double[] b) {
+            this.a = b[0];
+            this.b = new double[b.length - 1];
+            for (int i = 0; i < this.b.length; i++) {
+                this.b[i] = b[i + 1];
+            }
+        }
+        public double getIntercept() {
+            return a;
+        }
+        public double[] getSlope() {
+            return b;
+        }
+    }
+    // 等分散性検定
+    private class BartletTest implements OneWayAnovaTest {
+        private int n = 0;
+        public double calcTestStatistic(double[][] xi) {
+            n = xi.length;
+            double ln2L = logL(xi);
+
+            return calcB(ln2L, xi);
+        }
+        private double logL(double[][] xi) {
+            double[] si = new double[n];
+            DescriptiveStatistics stat = new DescriptiveStatistics();
+            double nisi2 = 0.0;    // (Ni - 1)*si^2の合計
+            double nilogsi2 = 0.0; // (Ni - 1)*log(si^2)の合計
+            int sumN = 0;
+
+            for(int i = 0; i < n; i++) {
+                Arrays.stream(xi[i]).forEach(stat::addValue);
+                sumN += stat.getN();
+                si[i] = stat.getVariance();
+                nisi2 += (stat.getN() - 1) * si[i];
+                nilogsi2 += (stat.getN() - 1) * Math.log(si[i]);
+                stat.clear();
+            }
+            double sumNin = sumN - n;
+            return sumNin * (Math.log(nisi2 / sumNin) - nilogsi2 / sumNin);
+        }
+        private double calcB(double ln2L, double[][] xi) {
+            double invSumN = 0.0;
+            int sumN = 0;
+            DescriptiveStatistics stat = new DescriptiveStatistics();
+
+            for(int i = 0; i < n; i++) {
+                Arrays.stream(xi[i]).forEach(stat::addValue);
+                invSumN += 1.0 / (stat.getN() - 1.0);
+                sumN += stat.getN();
+                stat.clear();
+            }
+            double deno = 1 + 1.0 / (3 * (n - 1))
+                        * (invSumN - 1.0 / (sumN - n));
+            return ln2L / deno;
+        }
+        public boolean execute_test(double statistic, double a) {
+            ChiSquaredDistribution chi2Dist = new ChiSquaredDistribution(n - 1);
+            double r_val = chi2Dist.inverseCumulativeProbability(1.0 - a);
+
+            return (r_val < statistic) ? true : false;
+        }
+    }
+
+    // 最小２乗法
+    private class OLSMultRegAna implements LineRegAna {
+        private OLSMultipleLinearRegression regression = null;
+        public OLSMultRegAna() {
+            regression = new OLSMultipleLinearRegression();
+        }
+        public LineReg lineRegAna(double[] yi, double xij[][]) {
+            regression.newSampleData(yi, xij);
+
+            double[] beta = regression.estimateRegressionParameters();
+
+            return new LineReg(beta);
+        }
+        // 決定係数取得
+        public double getR2(double[] yi, double xij[][]) {
+            regression.newSampleData(yi, xij);
+            return regression.calculateRSquared();
+        }
+        // 自由度調整済み決定係数
+        public double getAdjR2(double[] yi, double xij[][]) {
+            regression.newSampleData(yi, xij);
+            return regression.calculateAdjustedRSquared();
+        }
+        
+    }
+    // 一般化最小２乗法
+    private class GLSMultRegAna implements LineRegAna {
+        private GLSMultipleLinearRegression regression = null;
+        private double[][] data = null;
+        public GLSMultRegAna(double data[][]) {
+            regression = new GLSMultipleLinearRegression();
+            this.data = data;
+        }
+        public LineReg lineRegAna(double[] yi, double xij[][]) {
+            double[][] omega = calcCovatrianceMatrix();
+            regression.newSampleData(yi, xij, omega);
+
+            double[] beta = regression.estimateRegressionParameters();
+            return new LineReg(beta);
+        }
+        // 決定係数取得
+        public double getR2(double[] yi, double xij[][]) {
+            return 0.0;
+        }
+        // 自由度調整済み決定係数
+        public double getAdjR2(double[] yi, double xij[][]) {
+            return 0.0;
+        }
+        private double[][] calcCovatrianceMatrix() {
+            Covariance corel = new Covariance();
+            double[][] omega = new double[data.length][data.length];
+
+            for(int i = 0; i < data.length; i++) {
+                for(int j = 0; j < data.length; j++) {
+                    double[] xArray = data[i];
+                    double[] yArray = data[j];
+
+                    omega[i][j] = corel.covariance(xArray, yArray);
+                }
+            }
+            return omega;
+        }
+    }
+            
+}
+

data/ext/num4regana/PoissonRegAna.java

@@ -0,0 +1,82 @@
+public class PoissonRegAna {
+    private static PoissonRegAna regana = new PoissonRegAna();
+    public static PoissonRegAna getInstance() {
+        return regana;
+    }
+    public LineReg nonLineRegAna(double[] yi, double[][] xij) {
+        NonLineRegAna line = new NonLineRegAna();
+
+        return line.nonLineRegAna(yi, xij);
+    }
+    /*********************************/
+    /* interface define              */
+    /*********************************/
+    /*********************************/
+    /* class define                  */
+    /*********************************/
+    public class LineReg {
+        private double a   = 0.0;
+        private double[] b = null;
+        public LineReg(double[] b) {
+            this.a = b[0];
+            this.b = new double[b.length - 1];
+            for (int i = 0; i < this.b.length; i++) {
+                this.b[i] = b[i + 1];
+            }
+        }
+        public double getIntercept() {
+            return a;
+        }
+        public double[] getSlope() {
+            return b;
+        }
+    }
+    private class NonLineRegAna {
+        private final double eta = 0.005;
+        private final int num = 1000;
+        public LineReg nonLineRegAna(double[] yi, double[][] xij) {
+            double[] b = new double[1 + xij[0].length];
+            
+            for(int i = 0; i < b.length; i++) {
+                b[i] = 0.0;
+            }
+            for  (int i = 0; i < num; i++) {
+                b = grand_metod(yi, b, xij);
+            }
+
+            return new LineReg(b);
+        }
+        // q = b0 + b1 * x0
+        private double rereion(double[] b, double[] xi) {
+            double ret = b[0];
+
+            for(int i = 0; i < xi.length; i++) {
+                ret += b[i + 1] * xi[i];
+            }
+            return ret;
+        }
+        private double linkFunc(double q) {
+            return Math.exp(q);
+        }
+        private double[] grand_metod(double[] yi, double[] b, double[][] xij) {
+            double e0 = 0.0;
+            double[] en = new double[xij[0].length];
+
+            for(int i = 0; i < yi.length; i++) {
+                double q = rereion(b, xij[i]);
+                double p = linkFunc(q);
+
+                e0 += (yi[i] - p);
+                for(int j = 0; j < en.length; j++) {                
+                    en[j] += (yi[i] - p) * xij[i][j];
+                }
+            }
+            b[0] += eta * e0;
+            for(int j = 0; j < en.length; j++) {
+                b[1 + j] += eta * en[j];
+            }
+            return b;
+        }
+    }
+}
+

data/lib/num4glmregana.rb

@@ -0,0 +1,100 @@
+require 'java'
+require 'num4regana.jar'
+require 'commons-math3-3.6.1.jar'
+
+java_import 'LogitRegAna'
+java_import 'PoissonRegAna'
+
+# 一般化線形回帰分析
+#  (Apache commoms math3使用)
+module Num4GLMRegAnaLib
+    # (2項)ロジスティック回帰分析
+    class LogitRegAnaLib
+        def initialize
+            @multana = LogitRegAna.getInstance()
+        end
+        # (2項)ロジスティック回帰分析
+        #
+        # @overload non_line_reg_ana(yi, xij)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xij xの値(double[][])
+        #   @return [Hash] (intercept:定数項 slope:回帰係数)
+        # @example
+        #   glsyi = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        #   glsxij = [
+        #       [95],
+        #       [90],
+        #       [85],
+        #       [80],
+        #       [80],
+        #       [75],
+        #       [70],
+        #       [70],
+        #       [65],
+        #       [50],
+        #       [60],
+        #       [55],
+        #       [45],
+        #       [65],
+        #       [40],
+        #       [35],
+        #       [55],
+        #       [50],
+        #       [50],
+        #       [45],
+        #   ]
+        #   regana = Num4RegAnaLib::LogitRegAnaLib.new
+        #   regana.non_line_reg_ana(glsyi, glsxij)
+        #   => 
+        #     {
+        #       "intercept":  -17.81,    # 定数項
+        #       "slope":      [0.16],    # 回帰係数
+        #     }
+        def non_line_reg_ana(yi, xij)
+            multRet = @multana.nonLineRegAna(yi.to_java(Java::double), xij.to_java(Java::double[]))
+            retRb = {
+                "intercept":  multRet.getIntercept(), # 定数項
+                "slope":      multRet.getSlope().to_a,     # 回帰係数
+            }
+            return retRb
+        end
+    end
+    # ポアソン回帰分析
+    class PoissonRegAnaLib
+        def initialize
+            @multana = PoissonRegAna.getInstance()
+        end
+        # ポアソン回帰分析
+        #
+        # @overload non_line_reg_ana(yi, xij)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xij xの値(double[][])
+        #   @return [Hash] (intercept:定数項 slope:回帰係数)
+        # @example
+        #   glsyi = [4, 10, 7, 14]
+        #   glsxij = [
+        #       [1],
+        #       [2],
+        #       [3],
+        #       [4],
+        #   ]
+        #   regana = Num4RegAnaLib::PoissonRegAnaLib.new
+        #   regana.non_line_reg_ana(glsyi, glsxij)
+        #   => 
+        #     {
+        #        "intercept":  1.3138,    # 定数項
+        #        "slope":      [0.3173],  # 回帰係数
+        #     }
+        def non_line_reg_ana(yi, xij)
+            multRet = @multana.nonLineRegAna(yi.to_java(Java::double), xij.to_java(Java::double[]))
+            retRb = {
+                "intercept":  multRet.getIntercept(), # 定数項
+                "slope":      multRet.getSlope().to_a,     # 回帰係数
+            }
+            return retRb
+        end
+    end
+end
+
+
+

data/lib/num4lineregana.rb

@@ -0,0 +1,165 @@
+require 'java'
+require 'num4regana.jar'
+require 'commons-math3-3.6.1.jar'
+
+java_import 'SmplRegAna'
+java_import 'MultRegAna'
+# 線形回帰分析
+#  (Apache commoms math3使用)
+module Num4LineRegAnaLib
+    # 単回帰分析
+    class SmplRegAnaLib
+        def initialize
+            @regana = SmplRegAna.getInstance()
+        end
+        # 単回帰分析
+        #
+        # @overload line_reg_ana(yi, xi)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xi xの値(double[])
+        #   @return [Hash] (intercept:定数項 slope:回帰係数)
+        # @example
+        #   yi = [286, 851, 589, 389, 158, 1037, 463, 563, 372, 1020]
+        #   xi = [107, 336, 233,  82,  61,  378, 129, 313, 142,  428]
+        #   regana = Num4RegAnaLib::SmplRegAnaLib.new
+        #   regana.line_reg_ana(yi, xi)
+        #   => 
+        #     {
+        #        "intercept":  99.075, # 定数項
+        #        "slope":      2.145,  # 回帰係数
+        #     }
+        def line_reg_ana(yi, xi)
+            ret = @regana.lineRegAna(yi.to_java(Java::double), xi.to_java(Java::double))
+            retRb = {
+                "intercept":  ret.getIntercept(), # 定数項
+                "slope":      ret.getSlope(),     # 回帰係数
+            }
+            return retRb
+        end
+        # 決定係数
+        #
+        # @overload getr2(yi, xi)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xi xの値(double[])
+        #   @return [double] 決定係数
+        # @example
+        #   yi = [286, 851, 589, 389, 158, 1037, 463, 563, 372, 1020]
+        #   xi = [107, 336, 233,  82,  61,  378, 129, 313, 142,  428]
+        #   regana = Num4RegAnaLib::SmplRegAnaLib.new
+        #   regana.getr2(yi, xi)
+        #   => 0.893
+        def getr2(yi, xi)
+            return @regana.getR2(yi.to_java(Java::double), xi.to_java(Java::double))
+        end
+        # 相関係数
+        #
+        # @overload getr(yi, xi)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xi xの値(double[])
+        #   @return [double] 決定係数
+        # @example
+        #   yi = [286, 851, 589, 389, 158, 1037, 463, 563, 372, 1020]
+        #   xi = [107, 336, 233,  82,  61,  378, 129, 313, 142,  428]
+        #   regana = Num4RegAnaLib::SmplRegAnaLib.new
+        #   regana.getr(yi, xi)
+        #   => 0.945
+        def getr(yi, xi)
+            return @regana.getR(yi.to_java(Java::double), xi.to_java(Java::double))
+        end
+    end
+    # 重回帰分析(最小２乗法:等分散性checkあり)
+    class OLSMultRegAnaLib
+        def initialize
+            @multana = MultRegAna.getInstance()
+        end
+        # 重回帰分析
+        #
+        # @overload line_reg_ana(yi, xij)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xij xの値(double[][])
+        #   @return [Hash] (intercept:定数項 slope:回帰係数)
+        # @example
+        #   olsyi = [45, 38, 41, 34, 59, 47, 35, 43, 54, 52]
+        #   olsxij = [
+        #       [17.5, 30],
+        #       [17.0, 25],
+        #       [18.5, 20],
+        #       [16.0, 30],
+        #       [19.0, 45],
+        #       [19.5, 35],
+        #       [16.0, 25],
+        #       [18.0, 35],
+        #       [19.0, 35],
+        #       [19.5, 40],
+        #   ]
+        #   regana = Num4RegAnaLib::OLSMultRegAnaLib.new
+        #   regana.line_reg_ana(olsyi, olsxij)
+        #   => 
+        #     {
+        #        "intercept":  -34.71,           # 定数項
+        #        "slope":      [3.47, 0.53],     # 回帰係数
+        #     }
+        def line_reg_ana(yi, xij)
+            multRet = @multana.lineRegAna(yi.to_java(Java::double), xij.to_java(Java::double[]))
+
+            retRb = {
+                "intercept":  multRet.getIntercept(), # 定数項
+                "slope":      multRet.getSlope().to_a,     # 回帰係数
+            }
+            return retRb
+        end
+        # 決定係数
+        #
+        # @overload getr2(yi, xij)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xij xの値(double[][])
+        #   @return [double] 決定係数
+        # @example
+        #   olsyi = [45, 38, 41, 34, 59, 47, 35, 43, 54, 52]
+        #   olsxij = [
+        #       [17.5, 30],
+        #       [17.0, 25],
+        #       [18.5, 20],
+        #       [16.0, 30],
+        #       [19.0, 45],
+        #       [19.5, 35],
+        #       [16.0, 25],
+        #       [18.0, 35],
+        #       [19.0, 35],
+        #       [19.5, 40],
+        #   ]
+        #   regana = Num4RegAnaLib::OLSMultRegAnaLib.new
+        #   regana.getr2(yi, xi)
+        #   => 0.858
+        def getr2(yi, xij)
+            return @multana.getR2(yi.to_java(Java::double), xij.to_java(Java::double[]))
+        end
+        # 自由度調整済み決定係数
+        #
+        # @overload getadjr2(yi, xij)
+        #   @param [Array] yi yの値(double[])
+        #   @param [Array] xij xの値(double[][])
+        #   @return [double] 決定係数
+        # @example
+        #   olsyi = [45, 38, 41, 34, 59, 47, 35, 43, 54, 52]
+        #   olsxij = [
+        #       [17.5, 30],
+        #       [17.0, 25],
+        #       [18.5, 20],
+        #       [16.0, 30],
+        #       [19.0, 45],
+        #       [19.5, 35],
+        #       [16.0, 25],
+        #       [18.0, 35],
+        #       [19.0, 35],
+        #       [19.5, 40],
+        #   ]
+        #   regana = Num4RegAnaLib::OLSMultRegAnaLib.new
+        #   regana.getadjr2(yi, xij)
+        #   => 0.8176
+        def getadjr2(yi, xij)
+            return @multana.getAdjR2(yi.to_java(Java::double), xij.to_java(Java::double[]))
+        end
+    end
+end
+

data/lib/num4regana.rb

@@ -1,165 +1,9 @@
-require 'java'
-require 'num4regana.jar'
-require 'commons-math3-3.6.1.jar'
+require_relative('num4lineregana')
+require_relative('num4glmregana')
 
-java_import 'SmplRegAna'
-java_import 'OLSMultRegAna'
-# 回帰分析
-#  (Apache commoms math3使用)
 module Num4RegAnaLib
-    # 単回帰分析
-    class SmplRegAnaLib
-        def initialize
-            @regana = SmplRegAna.getInstance()
-        end
-        # 単回帰分析
-        #
-        # @overload line_reg_ana(yi, xi)
-        #   @param [Array] yi yの値(double[])
-        #   @param [Array] xi xの値(double[])
-        #   @return [Hash] (intercept:定数項 slope:回帰係数)
-        # @example
-        #   yi = [286, 851, 589, 389, 158, 1037, 463, 563, 372, 1020]
-        #   xi = [107, 336, 233,  82,  61,  378, 129, 313, 142,  428]
-        #   regana = Num4RegAnaLib::SmplRegAnaLib.new
-        #   regana.line_reg_ana(yi, xi)
-        #   => 
-        #     {
-        #        "intercept":  99.075, # 定数項
-        #        "slope":      2.145,  # 回帰係数
-        #     }
-        def line_reg_ana(yi, xi)
-            ret = @regana.lineRegAna(yi.to_java(Java::double), xi.to_java(Java::double))
-            retRb = {
-                "intercept":  ret.getIntercept(), # 定数項
-                "slope":      ret.getSlope(),     # 回帰係数
-            }
-            return retRb
-        end
-        # 決定係数
-        #
-        # @overload getr2(yi, xi)
-        #   @param [Array] yi yの値(double[])
-        #   @param [Array] xi xの値(double[])
-        #   @return [double] 決定係数
-        # @example
-        #   yi = [286, 851, 589, 389, 158, 1037, 463, 563, 372, 1020]
-        #   xi = [107, 336, 233,  82,  61,  378, 129, 313, 142,  428]
-        #   regana = Num4RegAnaLib::SmplRegAnaLib.new
-        #   regana.getr2(yi, xi)
-        #   => 0.893
-        def getr2(yi, xi)
-            return @regana.getR2(yi.to_java(Java::double), xi.to_java(Java::double))
-        end
-        # 相関係数
-        #
-        # @overload getr(yi, xi)
-        #   @param [Array] yi yの値(double[])
-        #   @param [Array] xi xの値(double[])
-        #   @return [double] 決定係数
-        # @example
-        #   yi = [286, 851, 589, 389, 158, 1037, 463, 563, 372, 1020]
-        #   xi = [107, 336, 233,  82,  61,  378, 129, 313, 142,  428]
-        #   regana = Num4RegAnaLib::SmplRegAnaLib.new
-        #   regana.getr(yi, xi)
-        #   => 0.945
-        def getr(yi, xi)
-            return @regana.getR(yi.to_java(Java::double), xi.to_java(Java::double))
-        end
-    end
-    # 重回帰分析(最小２乗法)
-    class OLSMultRegAnaLib
-        def initialize
-            @regana = OLSMultRegAna.getInstance()
-        end
-        # 重回帰分析
-        #
-        # @overload line_reg_ana(yi, xij)
-        #   @param [Array] yi yの値(double[])
-        #   @param [Array] xij xの値(double[][])
-        #   @return [Hash] (intercept:定数項 slope:回帰係数)
-        # @example
-        #   olsyi = [45, 38, 41, 34, 59, 47, 35, 43, 54, 52]
-        #   olsxij = [
-        #       [17.5, 30],
-        #       [17.0, 25],
-        #       [18.5, 20],
-        #       [16.0, 30],
-        #       [19.0, 45],
-        #       [19.5, 35],
-        #       [16.0, 25],
-        #       [18.0, 35],
-        #       [19.0, 35],
-        #       [19.5, 40],
-        #   ]
-        #   regana = Num4RegAnaLib::OLSMultRegAnaLib.new
-        #   regana.line_reg_ana(olsyi, olsxij)
-        #   => 
-        #     {
-        #        "intercept":  -34.71,           # 定数項
-        #        "slope":      [3.47, 0.53],     # 回帰係数
-        #     }
-        def line_reg_ana(yi, xij)
-            ret = @regana.lineRegAna(yi.to_java(Java::double), xij.to_java(Java::double[]))
-            retRb = {
-                "intercept":  ret.getIntercept(), # 定数項
-                "slope":      ret.getSlope().to_a,     # 回帰係数
-            }
-            return retRb
-        end
-        # 決定係数
-        #
-        # @overload getr2(yi, xij)
-        #   @param [Array] yi yの値(double[])
-        #   @param [Array] xij xの値(double[][])
-        #   @return [double] 決定係数
-        # @example
-        #   olsyi = [45, 38, 41, 34, 59, 47, 35, 43, 54, 52]
-        #   olsxij = [
-        #       [17.5, 30],
-        #       [17.0, 25],
-        #       [18.5, 20],
-        #       [16.0, 30],
-        #       [19.0, 45],
-        #       [19.5, 35],
-        #       [16.0, 25],
-        #       [18.0, 35],
-        #       [19.0, 35],
-        #       [19.5, 40],
-        #   ]
-        #   regana = Num4RegAnaLib::OLSMultRegAnaLib.new
-        #   regana.getr2(yi, xi)
-        #   => 0.858
-        def getr2(yi, xij)
-            return @regana.getR2(yi.to_java(Java::double), xij.to_java(Java::double[]))
-        end
-        # 自由度調整済み決定係数
-        #
-        # @overload getadjr2(yi, xij)
-        #   @param [Array] yi yの値(double[])
-        #   @param [Array] xij xの値(double[][])
-        #   @return [double] 決定係数
-        # @example
-        #   olsyi = [45, 38, 41, 34, 59, 47, 35, 43, 54, 52]
-        #   olsxij = [
-        #       [17.5, 30],
-        #       [17.0, 25],
-        #       [18.5, 20],
-        #       [16.0, 30],
-        #       [19.0, 45],
-        #       [19.5, 35],
-        #       [16.0, 25],
-        #       [18.0, 35],
-        #       [19.0, 35],
-        #       [19.5, 40],
-        #   ]
-        #   regana = Num4RegAnaLib::OLSMultRegAnaLib.new
-        #   regana.getadjr2(yi, xij)
-        #   => 0.8176
-        def getadjr2(yi, xij)
-            return @regana.getAdjR2(yi.to_java(Java::double), xij.to_java(Java::double[]))
-        end
-
-    end
+    include Num4LineRegAnaLib
+    include Num4GLMRegAnaLib
 end
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4regana
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-27 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -61,9 +61,13 @@ files:
 - Gemfile
 - LICENSE
 - Rakefile
-- ext/num4regana/OLSMultRegAna.java
+- ext/num4regana/LogitRegAna.java
+- ext/num4regana/MultRegAna.java
+- ext/num4regana/PoissonRegAna.java
 - ext/num4regana/SmplRegAna.java
 - lib/commons-math3-3.6.1.jar
+- lib/num4glmregana.rb
+- lib/num4lineregana.rb
 - lib/num4regana.rb
 homepage: http://github.com/siranovel/num4regana
 licenses:

data/ext/num4regana/OLSMultRegAna.java

@@ -1,75 +0,0 @@
-import org.apache.commons.math3.stat.regression.OLSMultipleLinearRegression;
-
-public class OLSMultRegAna {
-    private static OLSMultRegAna regana = new OLSMultRegAna();
-    public static OLSMultRegAna getInstance() {
-        return regana;
-    }
-    public LineReg lineRegAna(double[] yi, double xij[][]) {
-        LineRegAna line = new LineRegAna();
-
-        return line.lineRegAna(yi, xij);
-    }
-    public double getR2(double[] yi, double xij[][]) {
-        LineRegAna line = new LineRegAna();
-
-        return line.getR2(yi, xij);
-    }
-    public double getAdjR2(double[] yi, double xij[][]) {
-        LineRegAna line = new LineRegAna();
-
-        return line.getAdjR2(yi, xij);
-    }
-    /*********************************/
-    /* interface define              */
-    /*********************************/
-    /*********************************/
-    /* class define                  */
-    /*********************************/
-    public class LineReg {
-        private double a   = 0.0;
-        private double[] b = null;
-        public LineReg(double[] b) {
-            this.a = b[0];
-            this.b = new double[b.length - 1];
-            for (int i = 0; i < this.b.length; i++) {
-                this.b[i] = b[i + 1];
-            }
-        }
-        public double getIntercept() {
-            return a;
-        }
-        public double[] getSlope() {
-            return b;
-        }
-    }
-    private class LineRegAna {
-        // 最小２乗法
-        public LineReg lineRegAna(double[] yi, double xij[][]) {
-            OLSMultipleLinearRegression regression = new OLSMultipleLinearRegression();
-
-            regression.newSampleData(yi, xij);
-
-            double[] beta = regression.estimateRegressionParameters();
-
-            LineReg ret = new LineReg(beta);
-            return ret;
-        }
-        // 決定係数取得
-        public double getR2(double[] yi, double xij[][]) {
-            OLSMultipleLinearRegression regression = new OLSMultipleLinearRegression();
-
-            regression.newSampleData(yi, xij);
-            return regression.calculateRSquared();
-        }
-        // 自由度調整済み決定係数
-        public double getAdjR2(double[] yi, double xij[][]) {
-            OLSMultipleLinearRegression regression = new OLSMultipleLinearRegression();
-
-            regression.newSampleData(yi, xij);
-            return regression.calculateAdjustedRSquared();
-        }
-        
-    }
-}
-