statsailr 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8701d54a846ae0d81c7f91080586c7dd81b05c081743ba84606c46ecc53f25a8
-  data.tar.gz: 7f2636ea0b00008f160e303b389d977b94e7698a1eb800603850cff38901b14e
+  metadata.gz: 3404e4a53509861318d70a8309cf54fb82326f98d3715893ac3a1fe447eb94f5
+  data.tar.gz: cd48566b46c5ea5bdfd9fb38beb2381095f857b58ad1d0cbf2998ad5de4dded9
 SHA512:
-  metadata.gz: 4007addec1d2a15f05c62bef40850a31648b4e2099ac7cf79890f0cb480854561990b478420bf3ab750089c88b1013b7fe4261c15738cb608b893257c2ef5134
-  data.tar.gz: e38f0f64d035ab90bfdd8c052f63c1b4f0cd605cac841ddaefa18de6af127658f2c6453b4fbd74b7dfcf31e29920ba26c9b6db8b8211ee452ad983dce8c0ae3e
+  metadata.gz: f4ec746898a33f909803d6dbc4fc284818e3a65ba89c1e93199b0582c061e85ca6be472f77abdde9b9c9937bb43315e3ac8e9f4caa8e9d947b062c7c098c048d
+  data.tar.gz: ba926958960340cbd9ad2e278ef78841509ca2db771a1cab93def58b6b8eb305e7b40b29adb8410d8d48662c2e3568868183f739f89ce02937928f0f7d9a6010

data/lib/statsailr/block_to_r/proc_setting_support/proc_block_finalizer.rb

@@ -0,0 +1,10 @@
+class ProcBlockFinalizer
+  attr :enabled, true
+  def initialize
+    @enabled = false
+  end
+
+  def enabled?
+    return @enabled
+  end
+end

data/lib/statsailr/block_to_r/proc_setting_support/proc_opt_validator.rb

@@ -18,7 +18,7 @@ class ProcOptValidator
             raise "#{opt_name} is required for this PROC option"
           end
         end
-        if ! validator["is_a"].nil?
+        if ! param_manager.param_hash[opt_name].nil? && ! validator["is_a"].nil?
           if validator["is_a"].is_a?(Array)
             if ! validator["is_a"].include? class_name_in_param_manager
               raise "#{opt_name} needs to be one of #{validator["is_a"].join("|")}, but #{class_name_in_param_manager} is assigned"
@@ -30,7 +30,7 @@ class ProcOptValidator
           end
 
         end
-        if ! validator["as"].nil?
+        if ! param_manager.param_hash[opt_name].nil? && ! validator["as"].nil?
           if validator["as"] != class_name_in_param_manager
             case validator["as"]
             when "SymbolR"

data/lib/statsailr/block_to_r/proc_setting_support/proc_setting_module.rb

@@ -1,10 +1,12 @@
 require "pathname"
 require_relative("./proc_opt_validator.rb")
+require_relative("./proc_block_finalizer.rb")
 
 module ProcSettingModule
   def self.included base
     base.extend ClassMethods
     base.instance_variable_set(:@validator, ProcOptValidator.new())
+    base.instance_variable_set(:@finalizer, ProcBlockFinalizer.new())
     base.send :include, InstanceMethods
   end
 
@@ -12,6 +14,8 @@ module ProcSettingModule
     def extend_object( extender )
       extender.instance_variable_set(:@validator, @validator)
       extender.singleton_class.__send__( :attr_accessor, :validator)
+      extender.instance_variable_set(:@finalizer, @finalizer)
+      extender.singleton_class.__send__( :attr_accessor, :finalizer)
       super
     end
 
@@ -36,6 +40,14 @@ module ProcSettingModule
     def validator
       @validator
     end
+
+    def finalizer_enabled
+      @finalizer.enabled = true
+    end
+
+    def finalizer
+      @finalizer
+    end
   end
 
   module InstanceMethods

data/lib/statsailr/block_to_r/sts_block_to_r.rb

@@ -69,6 +69,8 @@ require_relative("proc_setting_support/proc_setting_module.rb")
 
 module ProcBlockToR
   include BlockToRSupport
+  FINALIZER_NAME = "finalizer"
+
   def self.create_lazy_funcs( blk , proc_setting_manager )
     proc_command = blk.command
     param_manager = RBridge::RParamManager.new( blk.opts )
@@ -90,6 +92,13 @@ module ProcBlockToR
     proc_lazy_funcs_with_print_result_opts = proc_stmts.map(){|proc_stmt|
       lzf_gen.gen_lazy_func( proc_command, proc_stmt, param_manager )
     }
+
+    finalizer = lzf_gen.finalizer
+    if finalizer.enabled?
+      finalizer_func = lzf_gen.gen_lazy_func( proc_command , [ FINALIZER_NAME, "", nil] , param_manager )
+      proc_lazy_funcs_with_print_result_opts.push( finalizer_func )
+    end
+
     return proc_lazy_funcs_with_print_result_opts
   end
 end

data/lib/statsailr/block_to_r/sts_lazy_func_gen.rb

@@ -84,6 +84,88 @@ module LazyFuncGeneratorSettingUtility
     return RBridge.create_strvec( result_ary )
   end
 
+  def read_named_args_as_named_strvec(ary)
+    arg_num_ary = Array.new( ary.size )
+    deapth_ary = Array.new( ary.size )
+    idx = 0
+    last_idx = ary.size - 1
+    arg_num = nil
+    deapth = nil
+
+    while( idx <= last_idx )
+      if( idx == 0 )
+        # name starts
+        unless ( deapth.nil? && ary[idx].is_a?(RBridge::SymbolR) && (ary[idx + 1].is_a?(RBridge::SignR) && ary[idx + 1].to_s == "="))
+          raise "read_named_args_as_named_strvec requires an argument to start with name=expr"
+        end
+        arg_num = 0
+        deapth = 0
+      elsif( deapth == 0 && ary[idx].is_a?(RBridge::SymbolR) && (ary[idx + 1].is_a?(RBridge::SignR) && ary[idx + 1].to_s == "="))
+        # name starts
+        arg_num = arg_num + 1
+      elsif( ary[idx].is_a?(RBridge::SymbolR) && (ary[idx + 1].is_a?(RBridge::SignR) && ary[idx + 1].to_s == "("))
+        # function starts
+        deapth_ary[idx] = deapth
+        arg_num_ary[idx] = arg_num
+        deapth = deapth + 1
+        idx = idx + 1
+        deapth_ary[idx] = deapth
+      elsif( ary[idx].is_a?(RBridge::SignR) && ary[idx].to_s == "(")
+        # parenthesis starts
+        deapth = deapth + 1
+        deapth_ary[idx] = deapth
+      elsif( ary[idx].is_a?(RBridge::SignR) && ary[idx].to_s == ")")
+        # parenthesis ends or function ends
+        deapth_ary[idx] = deapth
+        deapth = deapth - 1
+      else
+        deapth_ary[idx] = deapth
+      end
+      arg_num_ary[idx] = arg_num
+      idx = idx + 1
+    end
+
+    result_ary = []
+    name_ary = []
+    prev_arg_num = -1
+    idx = 0
+    elem_arg_num_ary = ary.zip( arg_num_ary )
+    while( idx < elem_arg_num_ary.size )
+      elem = ary[idx]
+      arg_num = arg_num_ary[idx]
+      if elem.respond_to? :to_s_for_r_parsing
+        elem_str = elem.to_s_for_r_parsing
+      else
+        elem_str = elem.to_s
+      end
+
+      if( arg_num != prev_arg_num ) # starts new 'name=expr'
+        name_ary.push elem_str
+        idx = idx + 1
+        if( ary[idx].to_s != "=" )
+          raise "An argument should be in the form of 'name=expr'"
+        end
+      else
+        if( result_ary[arg_num].nil? )
+          unless result_ary.size == arg_num
+            raise "arg_num is not an appropriate number."
+          end
+          result_ary[arg_num] = [elem_str]
+        else
+          result_ary[arg_num].push( elem_str )
+        end
+      end
+      idx = idx + 1
+      prev_arg_num = arg_num
+    end
+
+    result_vec = RBridge.create_strvec( result_ary.map(){|ary| ary.join(" ") } )
+    name_vec = RBridge.create_strvec( name_ary )
+    add_name_func = RBridge.create_ns_function_call("stats", "setNames", {"object" => result_vec, "nm" => name_vec })
+    result_name_vec = RBridge.exec_function( add_name_func )
+    return result_name_vec
+  end
+
   def result( name , *addl )
     if addl.empty?
       return RBridge::RResultName.new(name)
@@ -103,6 +185,10 @@ module LazyFuncGeneratorSettingUtility
     return RBridge::RResultPrevious.new( default_obj )
   end
 
+  def previous_inst_name()
+    return RBridge::RInstPrevious.new()
+  end
+
   def r_obj( val )
     return RBridge.convert_to_r_object( val )
   end

data/lib/statsailr/version.rb

@@ -1,3 +1,3 @@
 module StatSailr
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statsailr
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Toshihiro Umehara
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r_bridge
@@ -84,6 +84,7 @@ files:
 - lib/statsailr.rb
 - lib/statsailr/block_builder/sts_block.rb
 - lib/statsailr/block_builder/sts_block_parse_proc_opts.rb
+- lib/statsailr/block_to_r/proc_setting_support/proc_block_finalizer.rb
 - lib/statsailr/block_to_r/proc_setting_support/proc_opt_validator.rb
 - lib/statsailr/block_to_r/proc_setting_support/proc_setting_manager.rb
 - lib/statsailr/block_to_r/proc_setting_support/proc_setting_module.rb
@@ -111,7 +112,7 @@ metadata:
   homepage_uri: https://github.com/niceume/statsailr
   source_code_uri: https://github.com/niceume/statsailr
   changelog_uri: https://github.com/niceume/statsailr
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.31
+signing_key:
 specification_version: 4
 summary: Provides a platform to focus on statistics
 test_files: []