num4regana 0.0.2-java → 0.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6fa72619eb7a02bdc561494b9aae197c37b6a8558fd21106bdf15210a9af81
-  data.tar.gz: c7a55ac44970c164dc7379a11955f29416392ceba4605118f8bcbba459724e94
+  metadata.gz: e3b63549f4e9c8d1779a21f7247bae8c034c4066e9907b53c76281c84c18c114
+  data.tar.gz: 19bd91c1939a3055b03a5bf35b516e09f31360cdeb227baab648c5277f843de9
 SHA512:
-  metadata.gz: dd9e09e45d35384a3bfa9eb50a0132f4b3b3e970c2f97d241264a18a08986c3a46753d2292caf10c0ae1fcab8ec4f45f6456c97fe14df2ee9334168cd429a60a
-  data.tar.gz: 1cf8a55a5444c5e1e1a151adbb4d142bceaa9344cde28a859848b5642ce36660b6b919410907f8964105ec35df991591670ba8722658a708822e0840d790ce23
+  metadata.gz: ed0417b5fd2374d6ce4b3253484f532c40675fdf920e0bd7f10ec65e1c14ff7d1cf8be8fc748d9c68fe173613e67c4bcfa97235c43dbd4a9a65533a7a5fa38f1
+  data.tar.gz: a630e9d0ea9b931542b439617f9b28b38f1b0ac6e857ae95538cb04da60407af0882bf2654ec444abcbe150109c5e40bfcaf372d8514f5f621eb9af23cdb13fc

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Unreleased
 
+## [0.0.3] - 2024-09-05
+
+### add
+- add GLM
+  logistic regression analystis
+  poisson regression analystis
+
 ## [0.0.2] - 2024-08-08
 
 ### fix

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

@@ -12,33 +12,23 @@ public class MultRegAna {
         return regana;
     }
     public LineReg lineRegAna(double[] yi, double xij[][]) {
-        double[][] data = createData(yi, xij);
-        LineRegAna line = createLineRegAna(data);
+        LineRegAna line = createLineRegAna(yi, xij);
 
         return line.lineRegAna(yi, xij);
     }
     public double getR2(double[] yi, double xij[][]) {
-        double[][] data = createData(yi, xij);
-        LineRegAna line = createLineRegAna(data);
+        LineRegAna line = createLineRegAna(yi, xij);
 
         return line.getR2(yi, xij);
     }
     public double getAdjR2(double[] yi, double xij[][]) {
-        double[][] data = createData(yi, xij);
-        LineRegAna line = createLineRegAna(data);
+        LineRegAna line = createLineRegAna(yi, xij);
 
         return line.getAdjR2(yi, xij);
     }
-    private double[][] createData(double[] yi, double xij[][]) {
-        double[][] data = new double[yi.length][1 + xij[0].length];
+    private LineRegAna createLineRegAna(double[] yi, double xij[][]) {
+        double[][] data = createData(yi, xij);
 
-        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 LineRegAna createLineRegAna(double data[][]) {
         // 等分散性の検定
         if (false == bartletTest(data)) {  // 等分散性
             return new OLSMultRegAna();
@@ -47,6 +37,15 @@ public class MultRegAna {
             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);

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,166 +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 'MultRegAna'
-# 回帰分析
-#  (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
-    # 重回帰分析(最小２乗法:等分散性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
+    include Num4LineRegAnaLib
+    include Num4GLMRegAnaLib
 end
 
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: num4regana
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: java
 authors:
 - siranovel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-08 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/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: