somebee-rbench 0.2 → 0.2.1

data/lib/rbench/column.rb

@@ -11,16 +11,16 @@ module RBench
       @default = @compare ? @compare : options[:default]
     end
     
-    def to_s(value=title)
-      str = case value
-        when Array      then "%#{width-1}.2f" % (value[0] / value[1]) + "x"
-        when Float      then "%#{width}.3f" % value
-        when Integer    then "%#{width}.0f" % value
+    def to_s(val=title)
+      str = case val
+        when Array      then "%#{width-1}.2f" % (val[0] / val[1]) + "x"
+        when Float      then "%#{width}.3f" % val
+        when Integer    then "%#{width}.0f" % val
         when TrueClass  then " "*(width/2.0).floor + "X" + " "*(width/2.0).floor
-        when String     then "%#{width}s" % (value)[0,width]
+        when String     then "%#{width}s" % (val)[0,width]
         when Object     then " " * width
       end
-      return " #{(str+" "*width)[0,width]} |"
+      return " #{(str.to_s+" "*width)[0,width]} |"
     end
   end
 end

data/lib/rbench/group.rb

@@ -1,7 +1,7 @@
 module RBench
   class Group
     self.instance_methods.each do |m|
-      send(:undef_method, m) unless m =~ /^(__|is_a?|kind_of?|respond_to?|inspect|instance_eval)/
+      send(:undef_method, m) unless m =~ /^(__|is_a?|kind_of?|respond_to?|hash|eql?|inspect|instance_eval)/
     end
     
     attr_reader :name, :items, :block

data/lib/rbench/report.rb

@@ -1,7 +1,7 @@
 module RBench
   class Report
     self.instance_methods.each do |m|
-      send(:undef_method, m) unless m =~ /^(__|is_a?|kind_of?|respond_to?|inspect|instance_eval)/
+      send(:undef_method, m) unless m =~ /^(__|is_a?|kind_of?|respond_to?|hash|inspect|instance_eval|eql?)/
     end
     
     attr_reader :name, :cells
@@ -42,7 +42,10 @@ module RBench
       out = "%-#{@runner.desc_width}s" % name
       @runner.columns.each do |column|
         value = @cells[column.name]
-        out << column.to_s(value.is_a?(Array) ? @cells.values_at(*value) : value )
+        value = @cells.values_at(*value) if value.is_a?(Array)
+        value = nil if value.is_a?(Array) && value.nitems != 2
+        
+        out << column.to_s(value)
       end
       out << @runner.newline
     end

data/lib/rbench/summary.rb

@@ -1,5 +1,5 @@
 module RBench
-  class Summary < Report
+  class Summary
     attr_reader :name, :runner, :cells, :items
     attr_accessor :lines
     
@@ -13,15 +13,39 @@ module RBench
     
     def run
       # maybe add convenience-method to group to. group == runner really.
-      items = @group ? @group.items.select{|i| i.is_a?(Report)} : @runner.reports
+      items = (@group ? @group.items & @runner.reports : @runner.reports)
+      
+      rows = items.map{|item| item.cells.values_at(*@runner.columns.map{|c|c.name}) }
+      rows = rows.pop.zip(*rows)
 
-      @runner.columns.each do |c|
-        # TODO: Get number of fields that was counted in, and /
-        value = items.inject(0){|tot,i| v = i.cells[c.name]; tot += v.kind_of?(Numeric) ? v : 0 }
-        @cells[c.name] = value == 0 ? "" : value
+      @runner.columns.each_with_index do |c,i|
+        if c.compare
+          value,comparisons = 0,0
+          items.each do |item|
+            v1,v2 = *item.cells.values_at(*c.compare)
+            if v1.kind_of?(Numeric) && v2.kind_of?(Numeric) && v1 != 0 && v2 != 0
+              value += v1 / v2
+              comparisons += 1
+            end
+          end
+          @cells[c.name] = [value,comparisons] if comparisons > 0
+        else
+          @cells[c.name] = rows[i].compact.select{|r| r.kind_of?(Numeric)}.inject(0){|tot,v| tot += v.to_f }
+        end
       end
-      puts @runner.separator(nil,"=") unless @group
+      
       puts to_s
     end
+    
+    def to_s
+      out = ""
+      out << @runner.separator(nil,"=") + @runner.newline unless @group
+      out << "%-#{@runner.desc_width}s" % name
+      @runner.columns.each do |column|
+        value = @cells[column.name]
+        out << column.to_s( value )
+      end
+      out << @runner.newline
+    end
   end
 end

data/spec/rbench_spec.rb

@@ -90,7 +90,7 @@ bench = RBench.run(TIMES) do
   
     report "match" do
       dm { "aaa/aaa/aaa.bbb.ccc.ddd".match(/\.([^\.]*)$/) }
-      ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
+      #ar { "aaa//aaa//aaa.bbb.ccc.ddd.eee".match(/\.([^\.]*)$/) }
     end
   
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: somebee-rbench
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Yehuda Katz & Sindre Aarsaether