rbbt-util 5.21.85 → 5.21.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b0026548f0fd257ee1c8034c380bc81421e6b43
-  data.tar.gz: 3d71f163382164f5403f405c22f46f810dc94fff
+  metadata.gz: 14c71affcd04cfc765824f452e0455dd0a59befe
+  data.tar.gz: 57821f59ec541b8cb173fbcf64861ca793a0a032
 SHA512:
-  metadata.gz: 1cbbdfe188342713c7656ddd3f0dca2e85b8dfcf920aad550e66128d5c57151553c1ec213c5bfd0f09646ed2bc1e2dde4e6a55d3a4844481d2016eec0595464d
-  data.tar.gz: 3164ac445b99c1a05e6741bde5c59bb8352ae7ff9c7bae7fef99bf0aad523f54291f14d59f4d4b9e71daa1dccf2f12f5e6926cb33ada09d104ca212a6743731c
+  metadata.gz: 81cd59fb9a32bddf24ca25a7bb614faab5ced6bfdff678454b688992674c84029312d8c52dc2a29f9c3511945daf6be91e90375ba8b661e184a08330229be203
+  data.tar.gz: 2e45a91dcd62e667d9f16e83ff1c20f58bbf2111ab631e82a0e287cfa97a8e5c46af6fe6f0c79f75b99c30d6fceb62d91dcca2fe72eec4bc28d313386483df1f

data/lib/rbbt/association/util.rb

@@ -10,7 +10,7 @@ module Association
   end
 
   def self.parse_field_specification(spec)
-    return [2,nil,nil] if Fixnum === spec
+    return [2,nil,nil] if Numeric === spec
     spec = spec.split "=>" unless Array === spec
     field_part, final_format = spec
 
@@ -131,7 +131,7 @@ module Association
       header = case field
                when String 
                  field
-               when Fixnum
+               when Numeric
                  all_fields[field] 
                when :key
                  all_fields.first

data/lib/rbbt/persist/tsv/fix_width_table.rb

@@ -75,7 +75,7 @@ module Persist
     end
 
     def include?(i)
-      return true if Fixnum === i and i < pos(@size)
+      return true if Numeric === i and i < pos(@size)
       return true if metadata.include? i
       false
     end

data/lib/rbbt/persist/tsv/packed_index.rb

@@ -62,7 +62,7 @@ module Persist
      
     def add(key, value)
       key = pos_function.call(key) if pos_function 
-      if Fixnum === key
+      if Numeric === key
         @_last ||= -1
         skipped = key - @_last - 1
         skipped.times do
@@ -79,7 +79,7 @@ module Persist
     end
 
     def include?(i)
-      return true if Fixnum === i and i < size
+      return true if Numeric === i and i < size
       return true if metadata.include? i
       false
     end

data/lib/rbbt/tsv/manipulate.rb

@@ -114,7 +114,7 @@ module TSV
                              end
                            when @new_fields == :all
                              fields
-                           when (Fixnum === @new_fields and @new_fields <= 0)
+                           when (Numeric === @new_fields and @new_fields <= 0)
                              new = fields.dup
                              new.delete_at(- @new_fields)
                              new.unshift key_field
@@ -127,13 +127,13 @@ module TSV
         self.instance_eval do alias process process_null end
       when @new_key_field == :key 
         if type == :double
-          if Fixnum === @new_fields and @new_fields <= 0
+          if Numeric === @new_fields and @new_fields <= 0
             self.instance_eval do alias process process_subset_all_but_double end
           else
             self.instance_eval do alias process process_subset_double end
           end
         else
-          if Fixnum === @new_fields and @new_fields <= 0
+          if Numeric === @new_fields and @new_fields <= 0
             self.instance_eval do alias process process_subset_all_but_list end
           else
             self.instance_eval do alias process process_subset_list end
@@ -523,7 +523,7 @@ module TSV
           end
         end
 
-      when Fixnum === method
+      when Numeric === method
         with_unnamed do
           through :key, key do |key, values|
             new[key] = self[key] if invert ^ (values.flatten.length >= method)

data/lib/rbbt/tsv/parallel/traverse.rb

@@ -571,7 +571,7 @@ module TSV
                     when TrueClass
                       max = guess_max(obj)
                       Log::ProgressBar.new_bar(max, nil) 
-                    when Fixnum
+                    when Numeric
                       max = guess_max(obj)
                       Log::ProgressBar.new_bar(bar) 
                     when Hash

data/lib/rbbt/util/R.rb

@@ -112,7 +112,7 @@ source('#{UTIL}');
       "#{ object }"
     when String
       object[0] == ":" ? object[1..-1] : "'#{ object }'"
-    when Fixnum, Float
+    when Numeric
       object
     when TrueClass
       "TRUE"

data/lib/rbbt/util/R/model.rb

@@ -105,7 +105,7 @@ model = rbbt.model.load('#{model_file}');
 predict(model, data.frame(#{R.ruby2R tsv}));
         EOF
         Array === tsv.values.first ? res : res.first
-      when Fixnum, Array, Float, String
+      when Numeric, Array, String
         field = formula.split("~").last.strip
         field.gsub!(/log\((.*)\)/,'\1')
 

data/lib/rbbt/util/R/plot.rb

@@ -31,7 +31,7 @@ module R
           case v
           when FalseClass, TrueClass
             "'logical'"
-          when Fixnum, Float
+          when Numeric
             "'numeric'"
           when String
             if v.strip =~ /^[-+]?[\d\.]+$/
@@ -97,7 +97,7 @@ module R
         case v
         when FalseClass, TrueClass
           "'logical'"
-        when Fixnum, Float
+        when Numeric
           "'numeric'"
         when String
           if v.strip =~ /^[-+]?[\d\.]+$/
@@ -178,7 +178,7 @@ data = NULL
           case v
           when FalseClass, TrueClass
             "'logical'"
-          when Fixnum, Float
+          when Numeric
             "'numeric'"
           when String
             if v.strip =~ /^[-+]?[\d\.]+$/

data/lib/rbbt/util/color.rb

@@ -106,7 +106,7 @@ class Color
       return val if val.is_a?(Color)
 
       # Single value, assume grayscale
-      return Color.new(val, val, val) if val.is_a?(Fixnum)
+      return Color.new(val, val, val) if val.is_a?(Numeric)
 
       # Assume string
       str = val.to_s.upcase

data/lib/rbbt/util/colorize.rb

@@ -74,7 +74,7 @@ module Colorize
 
   def self.tsv(tsv, options = {})
     values = tsv.values.flatten
-    if Fixnum === values.first or Float === values.first or (values.first.to_f != 0 and values[0] != "0" and values[0] != "0.0")
+    if Numeric === values.first or (values.first.to_f != 0 and values[0] != "0" and values[0] != "0.0")
       value_colors = Misc.process_to_hash(values){continuous(values)}
     else
       value_colors = Misc.process_to_hash(values){distinct(values)}

data/lib/rbbt/util/concurrency/processes/worker.rb

@@ -62,7 +62,7 @@ class RbbtProcessQueue
       multiplier = case multiplier
                    when String
                      multiplier.to_s
-                   when Fixnum
+                   when Numeric
                      multiplier.to_i
                    else
                      3

data/lib/rbbt/util/log.rb

@@ -54,8 +54,8 @@ module Log
 
   def self.get_level(level)
     case level
-    when Fixnum
-      level
+    when Numeric
+      level.to_i
     when String
       begin
         Log.const_get(level.upcase)
@@ -123,7 +123,7 @@ module Log
   def self.color(severity, str = nil, reset = false)
     return str || "" if nocolor 
     color = reset ? Term::ANSIColor.reset : ""
-    color << SEVERITY_COLOR[severity] if Fixnum === severity
+    color << SEVERITY_COLOR[severity] if Integer === severity
     color << Term::ANSIColor.send(severity) if Symbol === severity and Term::ANSIColor.respond_to? severity 
     if str.nil?
       color

data/lib/rbbt/util/misc.rb

@@ -47,8 +47,8 @@ module Misc
     when FalseClass
       value === FalseClass or (String === value and value.downcase == 'false')
     when String
-      Fixnum === value ? value.to_f == condition.to_f : value == condition
-    when Fixnum
+      Numeric === value ? value.to_f == condition.to_f : value == condition
+    when Numeric
       value.to_f == condition.to_f
     when Array
       case condition.first

data/lib/rbbt/util/misc/options.rb

@@ -45,7 +45,7 @@ module Misc
 
   def self.hash2string(hash)
     hash.sort_by{|k,v| k.to_s}.collect{|k,v| 
-      next unless %w(Symbol String Float Fixnum Integer TrueClass FalseClass Module Class Object).include? v.class.to_s
+      next unless %w(Symbol String Float Fixnum Integer Numeric TrueClass FalseClass Module Class Object).include? v.class.to_s
       [ Symbol === k ? ":" << k.to_s : k,
         Symbol === v ? ":" << v.to_s : v] * "="
     }.compact * "#"
@@ -62,7 +62,7 @@ module Misc
 
   def self.hash2GET_params(hash)
     hash.sort_by{|k,v| k.to_s}.collect{|k,v| 
-      next unless %w(Symbol String Float Fixnum Integer TrueClass FalseClass Module Class Object Array).include? v.class.to_s
+      next unless %w(Symbol String Float Fixnum Integer Numeric TrueClass FalseClass Module Class Object Array).include? v.class.to_s
       v = case 
           when Symbol === v
             v.to_s
@@ -97,7 +97,7 @@ module Misc
         [k,"'" << v.to_s << "'"] * "="
       when TrueClass === v
         [k,"'" << v.to_s << "'"] * "="
-      when (Fixnum === v or Float === v)
+      when Numeric === v
         [k,"'" << v.to_s << "'"] * "="
       else
         nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-util
 version: !ruby/object:Gem::Version
-  version: 5.21.85
+  version: 5.21.86
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake