hellojava 0.0.3-java → 0.0.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cffd381d1e1109af675b8cb94187962e67b6dbf3ea6042eb97b5a9f073eb3ec
-  data.tar.gz: 46b0dd75a091b2102b8749a13b9875d9cc6ca0dbb5de8e8a29c14d9c983bff75
+  metadata.gz: cd8720bbd199d2a6550935f31fcb287c4a34c56989c37423e21b75e0a2c105fc
+  data.tar.gz: c7d9b01cfc2c859b8b22d2ee96d1a0aa4104bec9426d12c9d771aa9cb995235b
 SHA512:
-  metadata.gz: 38a4c1b06b61727bd80a75ef5304acbc07f3fd97f3cfd3ab18172e8d7386fe56d44e919dd0b02e25eac5525a600bf0f4ee39db60fbb406b0f72b55798c0edd63
-  data.tar.gz: 564535daf02d2b576adcd9a7af2baa000d0226b2ac1368bc2676a799bb8e07271e1a047c7d5e53c87d0cca1ff7dc0f12a9cebaa1ee4a22378d7dbe34f96abb22
+  metadata.gz: 97a9371b1ea24d09271d19ea2e3a3d89c170a997370ef1c0e52dbcb653f0b316113b1b9e6990f318871f99be6d83f4a9e4fb16fe31980117a412f7383b3dc440
+  data.tar.gz: d51e36fb15912e52fa54d3859b1e826f9470833eec0b422a887c8f49ef262451ddbed1d86ccd7725ccb66cb389607c55eb410068ca04d3d5c081f5e1c6bf3487

data/CHANGELOG.md

@@ -2,10 +2,23 @@
 
 ## Unreleased
 
+## [0.0.5] - 2023-12-31
+
+### Added
+- Add parameter test of Hash Type.
+
+### change
+- chg function name from func_d to func_v.
+
+## [0.0.4] - 2023-11-03
+
+### Added
+- Add parameter test of function type.
+
 ## [0.0.3] - 2023-10-21
 
 ### Added
-- Add test parameter of A two-dimensional array
+- Add parameter test of A two-dimensional array.
 
 ## [0.0.2] - 2023-09-27
 

data/ext/hellojava/JavaCallTest.java

@@ -1,4 +1,5 @@
 import java.util.ArrayList;
+import java.util.Map;
 
 public class JavaCallTest {
     public static String str1() {
@@ -16,6 +17,17 @@ public class JavaCallTest {
             }
             System.out.println();
         }
-    } 
+    }
+    public static void hash(Map<String, double[]> vals) {
+        System.out.println("hash in");
+        for(Map.Entry<String, double[]> entry : vals.entrySet()) {
+            System.out.print(entry.getKey());
+            double[] v = entry.getValue();
+            for(int i = 0; i < v.length; i++) {
+                System.out.printf(" %f", v[i]);
+            }
+            System.out.println();
+        }
+    }
 }
 

data/ext/hellojava/JavaCallTest2.java

@@ -0,0 +1,20 @@
+import java.util.function.Function;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+
+public class JavaCallTest2 {
+    public static void funcType1(String str, Consumer<String> func) {
+        System.out.println("funcType1 in");
+        func.accept(str);
+    }
+    public static String funcType2(Supplier<String> func) {
+        System.out.println("funcType2 in");
+        return func.get();
+    }
+    public static double funcType3(double[] vals, Function<double[], Double> func) {
+        System.out.println("funcType3 in");
+        return func.apply(vals);
+    }
+}
+

data/lib/hellojava.rb

@@ -2,8 +2,11 @@ require 'java'
 require 'hellojava.jar'
 java_import 'java.lang.System'
 java_import 'JavaCallTest'
+java_import 'JavaCallTest2'
 java_import 'Hoge'
+java_import 'java.util.HashMap'
 
+# jrubyからjavaの呼び出し
 module HelloJavaLib
     # Systemクラス使用
     #
@@ -40,7 +43,7 @@ module HelloJavaLib
     end
     # 引数に二次元配列の場合
     #
-    # @overload func_d(fname, vals)
+    # @overload func_v(fname, vals)
     #   @param [String] fname 文字列
     #   @param [Array]  vals 二次元の配列(double[][])
     #   @return [void]
@@ -49,23 +52,97 @@ module HelloJavaLib
     #             [12.3, 22.5, 33.7, 44.6],
     #             [12.3, 22.5, 33.7, 44.6, 55.8],
     #           ]
-    #    HelloJavaLib::func_d("fname.jpg", vals) 
+    #    HelloJavaLib::func_v("fname.jpg", vals) 
     #    =>
     #     fname:fname.jpg size:2
     #     vals[0] size:4
     #     12.300000 22.500000 33.700000 44.600000
     #     vals[1] size:5
     #     12.300000 22.500000 33.700000 44.600000 55.800000
-    def func_d(fname, vals)
-        p JavaCallTest.sub1(
+    def func_v(fname, vals)
+        JavaCallTest.sub1(
           fname, vals.to_java(Java::double[])
         );
         return
     end
+    # 引数にHashの場合
+    #
+    # @overload func_h(vals)
+    #   @param [Hash] vals Hash(String, double[])
+    #   @return [void]
+    # @example
+    #    vals = {
+    #             "dt1" => [12.3, 22.5, 33.7, 44.6],
+    #             "dt2" => [12.3, 22.5, 33.7, 44.6, 55.8],
+    #           }
+    #    HelloJavaLib::func_h(vals)
+    #    =>
+    #     hash in
+    #     dt1 12.300000 22.500000 33.700000 44.600000
+    #     dt2 12.300000 22.500000 33.700000 44.600000 55.800000
+    def func_h(vals)
+        o = HashMap.new
+        vals.each{|k, v|
+            o[k] = v.to_java(Java::double)
+        }
+        JavaCallTest.hash(o)
+    end
+    # 引数に関数型の場合
+    class FuncTypes
+        class << self
+            # @overload func_type1(str, &func)
+            #   @param [String] str  文字列
+            #   @param [block]  func 関数型(引数:文字列, 戻り値:なし)
+            #   @return [void]
+            # @example
+            #   HelloJavaLib::FuncTypes.func_type1("Hello") {|s|
+            #     p s + "!!"
+            #     next
+            #   }
+            #   =>
+            #     funcType1 in
+            #     "Hello!!"
+            def func_type1(str, &func)
+                JavaCallTest2.funcType1(str, func)
+                return
+            end
+            # @overload func_type2(&func)
+            #   @param [block] func 関数型(引数:なし, 戻り値:文字列)
+            #   @return [void]
+            # @example
+            #   HelloJavaLib::FuncTypes.func_type2() {
+            #     next "Hello"
+            #   }
+            #   =>
+            #     funcType2 in
+            #     "Hello"
+            def func_type2(&func)
+                p JavaCallTest2.funcType2(func)
+                return
+            end
+            # @overload func_type3(vals, &func)
+            #   @param [Array] vals double型の配列(duble[])
+            #   @param [block] func 関数型(引数:double[], 戻り値:double)
+            #   @return [void]
+            # @example
+            #   vals = [11, 22, 33, 44]
+            #   HelloJavaLib::FuncTypes.func_type3(vals) {|xi|
+            #     next xi.sum(0.0) / xi.length
+            #   }
+            #   =>
+            #     funcType3 in
+            #     27.5
+            def func_type3(vals, &func)
+                p JavaCallTest2.funcType3(vals.to_java(Java::double), func)
+                return
+            end
+
+        end
+    end
     module_function :func_a
     module_function :func_b
     module_function :func_c
-    module_function :func_d
-
+    module_function :func_v
+    module_function :func_h
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hellojava
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: java
 authors:
 - siranovel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-21 00:00:00.000000000 Z
+date: 2023-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -20,8 +20,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 12.3.3
   name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -40,8 +40,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.5
   name: rake-compiler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -64,6 +64,7 @@ files:
 - ext/hellojava/Calc.java
 - ext/hellojava/Hoge.java
 - ext/hellojava/JavaCallTest.java
+- ext/hellojava/JavaCallTest2.java
 - lib/hellojava.rb
 homepage: http://github.com/siranovel/stdy4act
 licenses: