bmg 0.18.3 → 0.18.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 340efbb84309b24fd818bd8ff0c0f40b1f2ba3b3f087e3af0ea574fbd1f7c4ef
-  data.tar.gz: d7c6af70390c893f6e198f89a019141b4d5727326183f1663aa7d2e15a7ef694
+  metadata.gz: 1e208e1eb958222f5ffac079296fc7279f221dddf6ed8165f5004b0a90b08c4b
+  data.tar.gz: 6e9e2509ae9ce0d277d226d55d29274b895a6b31dabfe9ac387d4be7fd97be4a
 SHA512:
-  metadata.gz: 69562558e784e35f6c8a81bf8b32f8f1a24bbabc176ca8fc109e8151ad324d15dece34d58cf44196a78387b645ae21ec2cb361cc71e11f93b14fd0c916bd1573
-  data.tar.gz: c25d6966c201c265d2b42dd976e29faf075a8ea285d609883f1f4a9d3c52c941e4c690741e5e277bd4ea8a7d8cfefa4d9adea3a575e2c6006b6993ad767351fb
+  metadata.gz: d142fd93326193529359a02c9e14936ffc43dd52ceab4b44e7d890b82cc0df4561e555002f0e6c12e53f6956a4541140be5214a40745ac54e1dc046bdbd4b735
+  data.tar.gz: 6fbbd1ad533a0beee8faf783e07c7cedcc2535ef9edf1b601f973a30a513e5ee6d00f0031c8486f4460ccb912acdbad623c86ca649d4664fdc24c63c3f5de693

data/lib/bmg/operator/rename.rb

@@ -31,15 +31,15 @@ module Bmg
       def each
         return to_enum unless block_given?
         @operand.each do |tuple|
-          yield rename(tuple, renaming)
+          yield rename_tuple(tuple, renaming)
         end
       end
 
       def insert(arg)
         case arg
-        when Hash       then operand.insert(rename(arg, reverse_renaming))
+        when Hash       then operand.insert(rename_tuple(arg, reverse_renaming))
         when Relation   then operand.insert(arg.rename(reverse_renaming))
-        when Enumerable then operand.insert(arg.map{|t| rename(t, reverse_renaming) })
+        when Enumerable then operand.insert(arg.map{|t| rename_tuple(t, reverse_renaming) })
         else
           super
         end
@@ -47,7 +47,7 @@ module Bmg
 
       def update(arg)
         case arg
-        when Hash then operand.update(rename(arg, reverse_renaming))
+        when Hash then operand.update(rename_tuple(arg, reverse_renaming))
         else
           super
         end
@@ -89,7 +89,7 @@ module Bmg
 
     private
 
-      def rename(tuple, renaming)
+      def rename_tuple(tuple, renaming)
         tuple.each_with_object({}){|(k,v),h|
           h[renaming[k] || k] = v
           h

data/lib/bmg/reader/excel.rb

@@ -25,7 +25,7 @@ module Bmg
           .each_with_index
           .each do |row, i|
             if i==0
-              headers = row.map(&:to_sym)
+              headers = row.map{|c| c.to_s.strip.to_sym }
             else
               init = init_tuple(i)
               tuple = (0...headers.size)

data/lib/bmg/summarizer/percentile.rb

@@ -10,10 +10,17 @@ module Bmg
     #
     class Percentile < Summarizer
 
-      def initialize(attribute = nil, nth = 50, &bl)
-        attribute, nth = nil, attribute if attribute.is_a?(Integer)
-        super(*[attribute].compact, &bl)
-        @nth = nth
+      DEFAULT_OPTIONS = {
+        :variant => :continuous
+      }
+
+      def initialize(*args, &bl)
+        @nth = args.find{|a| a.is_a?(Integer) } || 50
+        functor = args.find{|a| a.is_a?(Symbol) } || bl
+        options = args.select{|a| a.is_a?(Hash) }.inject(DEFAULT_OPTIONS){|memo,opts|
+          memo.merge(opts)
+        }.dup
+        super(functor, options)
       end
 
       # Returns [] as least value.
@@ -29,19 +36,44 @@ module Bmg
       # Finalizes the computation.
       def finalize(memo)
         return nil if memo.empty?
-        index = memo.size * (@nth / 100.0)
-        above = [[index.ceil - 1, memo.size - 1].min, 0].max
-        below = [index.floor - 1, 0].max
+        index = memo.size.to_f * (@nth.to_f / 100.0)
+        floor, ceil = index.floor, index.ceil
+        ceil +=1 if floor == ceil
+        below = [floor - 1, 0].max
+        above = [[ceil - 1, memo.size - 1].min, 0].max
         sorted = memo.sort
-        (sorted[above] + sorted[below]) / 2
+        if options[:variant] == :continuous
+          (sorted[above] + sorted[below]) / 2.0
+        else
+          sorted[below]
+        end
       end
 
     end # class Avg
 
-    # Factors an average summarizer
     def self.percentile(*args, &bl)
       Percentile.new(*args, &bl)
     end
 
+    def self.percentile_cont(*args, &bl)
+      Percentile.new(*(args + [{:variant => :continuous}]), &bl)
+    end
+
+    def self.percentile_disc(*args, &bl)
+      Percentile.new(*(args + [{:variant => :discrete}]), &bl)
+    end
+
+    def self.median(*args, &bl)
+      Percentile.new(*(args + [50]), &bl)
+    end
+
+    def self.median_cont(*args, &bl)
+      Percentile.new(*(args + [50, {:variant => :continuous}]), &bl)
+    end
+
+    def self.median_disc(*args, &bl)
+      Percentile.new(*(args + [50, {:variant => :discrete}]), &bl)
+    end
+
   end # class Summarizer
 end # module Bmg

data/lib/bmg/support/tuple_transformer.rb

@@ -32,7 +32,16 @@ module Bmg
           }
         when Hash
           with.each_with_object(tuple.dup){|(k,v),dup|
-            dup[k] = transform_attr(dup[k], v)
+            case k
+            when Symbol
+              dup[k] = transform_attr(dup[k], v)
+            when Class
+              dup.keys.each do |attrname|
+                dup[attrname] = transform_attr(dup[attrname], v) if dup[attrname].is_a?(k)
+              end
+            else
+              raise ArgumentError, "Unexpected transformation `#{with.inspect}`"
+            end
           }
         when Array
           with.inject(tuple){|dup,on|

data/lib/bmg/version.rb

@@ -2,7 +2,7 @@ module Bmg
   module Version
     MAJOR = 0
     MINOR = 18
-    TINY  = 3
+    TINY  = 4
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmg
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 0.18.4
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: predicate