benelux 0.3.0.002 → 0.3.2

data/CHANGES.txt

@@ -1,6 +1,14 @@
 BENELUX, CHANGES
 
 
+#### 0.3.2 (2009-10-02) ###############################
+
+* CHANGE: Major performance improvement.
+
+#### 0.3.1 (2009-09-30) ###############################
+
+* FIXED: Rubygems versioning issue. 
+
 #### 0.3.0 (2009-09-30) ###############################
 
 Initial public release

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.3.0.002"
+  s.version = "0.3.2"
   s.summary = "Benelux: Little freakin' timers for your Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

data/lib/benelux.rb

@@ -3,7 +3,7 @@ require 'hexoid'
 require 'thread'
 
 module Benelux
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end

data/lib/benelux/stats.rb

@@ -82,8 +82,8 @@ module Benelux
       def sd()      merge.sd     end
       def n()       merge.n      end
       
-      def merge(*tags)
-        tags = Benelux::TagHelpers.normalize tags
+      def merge(tags={})
+#        tags = Benelux::TagHelpers.normalize tags
         mc = Calculator.new
         all = tags.empty? ? self : self.filter(tags)
         all.each { |calc| 
@@ -93,8 +93,8 @@ module Benelux
         mc
       end
       
-      def [](*tags)
-        tags = Benelux::TagHelpers.normalize tags
+      def [](tags={})
+#        tags = Benelux::TagHelpers.normalize tags
         g = Benelux::Stats::Group.new @name
         g << self.select { |c| c.tags >= tags }
         g.flatten!(1)  # only 1 level deep
@@ -152,16 +152,21 @@ module Benelux
   
       # Dump this Stats object with an optional additional message.
       def dump(msg = "", out=STDERR)
-        out.puts "#{msg}: #{self.inspect}"
+        out.puts "#{msg}: #{self.report}"
       end
 
       # Returns a common display (used by dump)
-      def inspect
+      def report
         v = [mean, @n, @sum, @sumsq, sd, @min, @max]
         t = %q'%8d(N) %10.4f(SUM) %8.4f(SUMSQ) %8.4f(SD) %8.4f(MIN) %8.4f(MAX)'
         ('%0.4f: ' << t) % v
       end
-
+      
+      def inspect
+        v = [ mean, @n, @sum, @sumsq, sd, @min, @max, tags]
+        "%.4f: n=%.4f sum=%.4f sumsq=%.4f sd=%.4f min=%.4f max=%.4f %s" % v
+      end
+      
       def to_s; mean.to_s; end
       def to_f; mean.to_f; end
       def to_i; mean.to_i; end

data/lib/benelux/tags.rb

@@ -66,8 +66,8 @@ module Benelux
       to_s
     end
     
-    def ==(*other)
-      other = Benelux::TagHelpers.normalize other
+    def ==(other)
+#      other = Benelux::TagHelpers.normalize other
       if other.is_a?(Array)
         (self.values & other).sort == other.sort
       else
@@ -86,25 +86,31 @@ module Benelux
     #     a >= [2, 1]                        # => true
     #     a > [2, 1]                         # => false
     #
-    def <=>(*other)
-      other = Benelux::TagHelpers.normalize other
-      return 0 if self == other
-      if other.is_a?(Array)
-        return -1 unless (self.values & other).size >= other.size
-      else
-        return -1 unless (self.keys & other.keys).size >= other.keys.size
-        other.each_pair { |n,v| 
-          return -1 unless self.has_key?(n) && self[n] == v
-        }
-      end
-      1
+    def <=>(b)
+      #other = Benelux::TagHelpers.normalize other
+      return 0 if self == b
+      self.send :"compare_#{b.class}", b
     end
-    
+        
     def >(other)  (self <=> other) > 0  end
     def <(other)  (self <=> other) < 0  end
     
     def <=(other) (self <=> other) <= 0 end
     def >=(other) (self <=> other) >= 0 end
+    
+    private
+    
+    def compare_Hash(b)
+      a = self
+      return -1 unless (a.values_at(*b.keys) & b.values).size >= b.size
+      1
+    end
+    alias_method :"compare_Benelux::Tags", :compare_Hash
+    
+    def compare_Array(b)
+      return -1 unless (self.values & b).size >= b.size
+      1
+    end
       
   end
 end

data/lib/benelux/timeline.rb

@@ -66,7 +66,7 @@ module Benelux
     end
     
     def [](tags={})
-      tags = Benelux::TagHelpers.normalize tags
+      #tags = Benelux::TagHelpers.normalize tags
       marks = self.select do |mark|
         mark.tags >= tags
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.002
+  version: 0.3.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 -04:00
+date: 2009-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency