r_bridge 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d7f74da4e1b6be0717eb1aad13197269106b65abd080922cf19e34f7ed58b5d
-  data.tar.gz: e8b58e04c13954ed86ca44070861a7fb59f9b5d6fc66c0aa0268b631ebd56e23
+  metadata.gz: b2f3e3fc8242a4204e378f7f86bcc3ca120b163aca161e7b5f7bca12f66eecc3
+  data.tar.gz: 64d9be810cc38ed60bff9204c8dbdf5e1668d295f99d617f7bcfbcf91aea0041
 SHA512:
-  metadata.gz: 98ef89344e79fd315d8bf05d80a74116747ad6d7e0faaafb38895dbb5b787626d0fc44113cd504d8f3b1537264725177822e6280fa5eeee3d96228a68a6d140a
-  data.tar.gz: d89e882f5f0a3cc345345e0436da5848de0d6d257876debe6df64aae5bc5938162b831a535c97fb8791f844427555c096b2e9841d86cecbe2a7a24414105fc58
+  metadata.gz: 3af47902e433e3d7be48d472a28d6d84d6cb684f09fa321db31cf8d2ad007af682d8ad401aba3544158fb9853262f224e531a9c0e769c22aa27957b307a4015a
+  data.tar.gz: a43acbb159c37d3ac14ca2580090c810081977d44786812349d901d8ba450173b21ee6ac412a1e9962378fa075030e9b56b52b53e786804969c2fe7406d52257

data/README.md

@@ -218,12 +218,15 @@ RBridge.create_extptr( ffi_ptr )
 
 create_ns_function_call, create_env_function_call and create_function_call create R's internal S expresion structures for function calls. create_ns_function_call can specify (package) namespace. create_env_function_call can specify environment name.
 
-Arguments are passed as Ruby Hash, and each Hash's value needs to point to R's object. You usually pass R vectors, but you can also pass another function call as an argument.
+Arguments are passed as Ruby's Hash like objects, Hash or assocation Array, and their each element's value needs to be R's object. For these R objects You can assign not only R vectors but also other function calls.
+
+Assocation Arrays are useful when you have more than one elements with the same key name, which Hash does not allow. This happens when you do not specify parameter name and you use empty Strings, "", as parameter names.
+
 
 ```
-RBridge.create_ns_function_call( ns, fname, hash )
-RBridge.create_env_function_call( env, fname, hash )
-RBridge.create_function_call( fname,  hash )
+RBridge.create_ns_function_call( ns, fname, hash_like )
+RBridge.create_env_function_call( env, fname, hash_like )
+RBridge.create_function_call( fname,  hash_like )
 
 (e.g.)
 # pass vector to argument
@@ -248,6 +251,10 @@ RBridge.exec_function_no_return( RBridge.create_function_call( "print", {"" => c
 #
 RBridge.exec_function_no_return( RBridge.create_function_call("source", { "" => RBridge.create_strvec(["newenv.R"]) }))
 RBridge.exec_function_no_return( RBridge.create_env_function_call("newenv", "hello", { } ))
+
+# pass association Array to argument
+add = RBridge.create_function_call( "+", [["" , RBridge.create_intvec( [1,2,3] )],["", RBridge.create_intvec( [10,20,30] ) ]] )
+RBridge.exec_function( RBridge.create_function_call("print", [["" , add ]]))
 ```
 
 The followings are utility functions. assign() and library() are frequently used in R, and easy ways to create them are provided.

data/lib/r_bridge/r_bridge_ffi.rb

@@ -303,20 +303,44 @@ module RBridge
     return extptr
   end
 
-  def self.hash_to_lcons_args( hash ) 
-    raise "hash_to_lcons_args should take Hash argument" if(hash.class != Hash)
-    if(hash.size == 0)
+  def self.array_depth (ary)
+    return 0 unless ary.is_a?(Array)
+    return 1 + ary.map(){|elem| array_depth(elem) }.max()
+  end
+
+  def self.assoc_array?(ary)
+    if ary.map(){|elem| elem.size }.uniq == [2]
+      true
+    else
+      false
+    end
+  end
+
+  def self.hash_to_lcons_args( hash_like )
+    if hash_like.class == Hash
+      # hash
+    elsif hash_like.class == Array
+      if array_depth(hash_like) == 2 && assoc_array?(hash_like)
+        # association array
+      else
+        raise "hash_to_lcons_args should take Hash argument (or Association Array argument)"
+      end
+    else
+      raise "hash_to_lcons_args should take Hash argument (or Association Array argument)"
+    end
+
+    if(hash_like.size == 0)
       lcons_args = r_lang_nil()
-    elsif(hash.size == 1)
-      tag = hash.first[0]
-      val = hash.first[1]
+    elsif(hash_like.size == 1)
+      tag = hash_like.first[0]
+      val = hash_like.first[1]
       lcons_args = lcons_gen( val )
       if( tag != "" )
         set_tag_to_lcons( lcons_args, tag )
       end
     else
       idx = 0
-      hash.reverse_each(){|arg|
+      hash_like.reverse_each(){|arg|
         tag = arg[0]
         val = arg[1]
         if(idx == 0 )
@@ -333,32 +357,32 @@ module RBridge
     return lcons_args
   end
 
-  def self.create_ns_function_call( ns, fname, hash )
+  def self.create_ns_function_call( ns, fname, hash_like )
     raise "create_ns_function_call should take String for namespace" if(ns.class != String) 
     raise "create_ns_function_call should take String for function name" if(fname.class != String) 
-    raise "create_ns_function_call should take Hash for function arguments" if(hash.class != Hash)
-    lcons_args = hash_to_lcons_args( hash )
+    raise "create_ns_function_call should take Hash like structure for function arguments" if(hash_like.class != Hash && hash_like.class != Array)
+    lcons_args = hash_to_lcons_args( hash_like )
 
     new_function_call = r_lang_create_ns_fcall(ns, fname, lcons_args)
     ptr_manager_add_ptr_to_current( new_function_call )
     return new_function_call
   end
 
-  def self.create_env_function_call( env, fname, hash )
+  def self.create_env_function_call( env, fname, hash_like )
     raise "create_env_function_call should take String for env" if(env.class != String) 
     raise "create_env_function_call should take String for function name" if(fname.class != String) 
-    raise "create_env_function_call should take Hash for function arguments" if(hash.class != Hash)
-    lcons_args = hash_to_lcons_args( hash )
+    raise "create_env_function_call should take Hash like structure for function arguments" if(hash_like.class != Hash && hash_like.class != Array)
+    lcons_args = hash_to_lcons_args( hash_like )
 
     new_function_call = r_lang_create_env_fcall(env, fname, lcons_args)
     ptr_manager_add_ptr_to_current( new_function_call )
     return new_function_call
   end
 
-  def self.create_function_call( fname,  hash )
+  def self.create_function_call( fname,  hash_like )
     raise "create_function_call should take String for function name" if(fname.class != String) 
-    raise "create_function_call should take Hash for function arguments" if(hash.class != Hash)
-    lcons_args = hash_to_lcons_args( hash )
+    raise "create_function_call should take Hash like structure for function arguments" if(hash_like.class != Hash && hash_like.class != Array)
+    lcons_args = hash_to_lcons_args( hash_like )
 
     new_function_call = r_lang_create_fcall(fname, lcons_args)
     ptr_manager_add_ptr_to_current( new_function_call )

data/lib/r_bridge/r_bridge_lazyfunc_ext.rb

@@ -1,38 +1,36 @@
 require "r_bridge/r_bridge_ffi"
 
 module RBridge
-  def self.create_ns_lazy_function( ns, fname, hash , param_manager)
+  def self.create_ns_lazy_function( ns, fname, hash_like , param_manager)
     raise "create_ns_lazy_function should take String for namespace" if(ns.class != String) 
     raise "create_ns_lazy_function should take String for function name" if(fname.class != String) 
-    raise "create_ns_lazy_function should take Hash for function arguments" if(hash.class != Hash)
-    return LazyFunc.new( ns, nil, fname, hash , param_manager)
+    raise "create_ns_lazy_function should take Hash like structure for function arguments" if(hash_like.class != Hash && hash_like.class != Array)
+    return LazyFunc.new( ns, nil, fname, hash_like, param_manager)
   end
 
-  def self.create_env_lazy_function( env, fname, hash , param_manager)
+  def self.create_env_lazy_function( env, fname, hash_like , param_manager)
     raise "create_env_lazy_function should take String for environment" if(env.class != String) 
     raise "create_env_lazy_function should take String for function name" if(fname.class != String) 
-    raise "create_env_lazy_function should take Hash for function arguments" if(hash.class != Hash)
-    return LazyFunc.new( nil, env, fname, hash , param_manager)
+    raise "create_env_lazy_function should take Hash like structure for function arguments" if(hash_like.class != Hash && hash_like.class != Array)
+    return LazyFunc.new( nil, env, fname, hash_like, param_manager)
   end
 
-  def self.create_lazy_function( fname, hash , param_manager)
+  def self.create_lazy_function( fname, hash_like , param_manager)
     raise "create_lazy_function should take String for function name" if(fname.class != String) 
-    raise "create_lazy_function should take Hash for function arguments" if(hash.class != Hash)
-    return LazyFunc.new( nil, nil, fname, hash , param_manager)
+    raise "create_lazy_function should take Hash like structure for function arguments" if(hash_like.class != Hash && hash_like.class != Array)
+    return LazyFunc.new( nil, nil, fname, hash_like, param_manager)
   end
 
   def self.create_function_call_from_lazy_function_attrs( ns, env, fname, fargs, param_manager, result_manager)
-    farg_keys = fargs.keys
 
-    new_arg_hash = {}
-    farg_keys.each(){|key|
-      val = fargs[key]
+    new_arg_assoc_array = []
+    fargs.each(){|key, val|
 
       if val.is_a? RResultPrevious
         r_previous = result_manager.get_previous() # if r_nil (i.e. 1st instruction or no previous result-store instructions) we need to use default one.
         if ! RBridge::is_r_nil?(r_previous)  # When previous result exists
-          new_arg_hash[key] = r_previous
-          break
+          new_arg_assoc_array << [key, r_previous]
+          next
         else  # When previous result does not exist
           val = val.default
         end
@@ -40,11 +38,11 @@ module RBridge
 
       case val
       when LazyFunc then
-        new_arg_hash[key] = create_function_call_from_lazy_function_attrs( val.ns, val.env, val.fname, val.args , param_manager, result_manager )
+        new_arg_assoc_array << [key, create_function_call_from_lazy_function_attrs( val.ns, val.env, val.fname, val.args , param_manager, result_manager )]
       when RResultName , RResultNameArray then 
-        new_arg_hash[key] = result_manager.get_last_for( val )
+        new_arg_assoc_array << [key, result_manager.get_last_for( val )]
       when RParamName then
-        new_arg_hash[key] = param_manager.get_r_object( val )
+        new_arg_assoc_array << [key, param_manager.get_r_object( val )]
       when RNameContainer then
         idx = 0
         while idx < val.elems.size do
@@ -53,37 +51,37 @@ module RBridge
           when RResultName, RResultNameArray then 
             result = result_manager.get_last_for( elem )
             if( ! RBridge::is_r_nil?(result) )
-              new_arg_hash[key] = result
+              new_arg_assoc_array << [key, result]
               break
             end
           when RParamName then
             result = param_manager.get_r_object( elem )
             if( ! RBridge::is_r_nil?(result) )
-              new_arg_hash[key] = result
+              new_arg_assoc_array << [key, result]
               break
             end
           else  # R object
-            new_arg_hash[key] = val
+            new_arg_assoc_array << [key, val]
             break
           end
           idx = idx + 1
         end
         if(idx == val.elems.size ) # Not found
-          new_arg_hash[key] = RBridge::r_nil()
+          new_arg_assoc_array << [key, RBridge::r_nil()]
         end
       else  # R object
-        new_arg_hash[key] = val
+        new_arg_assoc_array << [key, val]
       end
     }
     if( ns.nil? )
       if( env.nil? )
-        return create_function_call( fname, new_arg_hash )
+        return create_function_call( fname, new_arg_assoc_array )
       else
-        return create_env_function_call( env, fname, new_arg_hash )
+        return create_env_function_call( env, fname, new_arg_assoc_array )
       end
     else
       if( env.nil? )
-        return create_ns_function_call( ns, fname, new_arg_hash )
+        return create_ns_function_call( ns, fname, new_arg_assoc_array )
       else
         raise "namespace and environment are not allowed to be specified at the same time."
       end
@@ -243,7 +241,6 @@ module RBridge
     end
 
     def get_previous()
-       p @results
        if @results.size > 0
         r_obj = @results.last[1]
         return r_obj

data/lib/r_bridge/version.rb

@@ -1,3 +1,3 @@
 module RBridge
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: r_bridge
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Toshihiro Umehara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi