statval 0.1.1 → 0.1.2

data/lib/statval/statval.rb

@@ -2,9 +2,6 @@ module StatVal
 
   class StatVal
 
-    POS_INFINITY =   1.0/0.0
-    NEG_INFINITY = - 1.0/0.0
-
     attr_reader :num
     attr_reader :min
     attr_reader :max
@@ -23,12 +20,7 @@ module StatVal
       options
     end
 
-
-    def all_keys ; [ :avg, :std, :min, :max, :num, :sum, :sq_sum, :avg_sq, :var ] end
-    def default_keys ; [ :avg, :std, :min, :max, :num ] end
-    def writable_keys ; [ :num, :min, :max, :sum, :sq_sum ] end
-
-    alias_method :keys, :default_keys
+    def keys ; ::StatVal.keys(:default) end
 
     def [](key)
       case key
@@ -121,27 +113,8 @@ module StatVal
       end
     end
     
-    def key_hash(which_keys = nil)
-      return which_keys if which_keys.is_a?(Hash)
-
-      case which_keys
-        when nil then iter = keys
-        when :all then iter = all_keys
-        when :default then iter = default_keys
-        when :writable then iter = writable_keys
-        else
-          if which_keys.repsond_to?(:each)
-            iter = which_Keys
-          else
-            return { which_keys => which_keys }
-          end
-      end
-
-      iter.inject({}) { |h, k| h[k] = k; h }
-    end
-
-    def to_hash(which_keys = nil)
-      key_hash(which_keys).inject({}) { |h, (name, attr)| h[name] = self[attr]; h }
+    def to_hash(which_keys = nil, convert_to_s = false)
+      ::StatVal.key_hash(which_keys).inject({}) { |h, (attr, name)| h[(if convert_to_s then name.to_s else name end)] = self[attr]; h }
     end
 
     def to_s ; to_hash.to_s end
@@ -183,14 +156,39 @@ module StatVal
       @max = if new_val then new_val else (if empty? then NEG_INFINITY else avg+std end) end
     end
 
+    def std_ratio ; std / avg end
+
     private
 
-    def abs_is_infinite(val) ; val.abs.to_f === POS_INFINITY end
+    POS_INFINITY =   1.0/0.0
+    NEG_INFINITY = - 1.0/0.0
 
+    def abs_is_infinite(val) ; val.abs.to_f === POS_INFINITY end
     def zero_if_unbounded(val) ; if bounded? then val else 0.0 end end
-
     def abs_div(nom, denom) ; nom.abs.to_f / denom end
+  end
 
+  def self.new(options = {}) ; StatVal.new(options) end
+
+  def self.all_keys ; [ :avg, :std, :std_ratio, :min, :max, :num, :sum, :sq_sum, :avg_sq, :var ] end
+  def self.default_keys ; [ :avg, :std, :min, :max, :num ] end
+  def self.writable_keys ; [ :num, :min, :max, :sum, :sq_sum ] end
+
+  def self.keys(ident = :default)
+    case ident
+    when :all then all_keys
+    when :writable then writable_keys
+    when :default then default_keys
+    when nil then default_keys
+    else
+      return ident if ident.respond_to?(:each)
+      return [ident]
+    end
+  end
+
+  def self.key_hash(which_keys = nil)
+    return which_keys if which_keys.is_a?(Hash)
+    keys(which_keys).inject({}) { |h, k| h[k] = k; h }
   end
 
   # Take hash that contains StatVal values and create new hash that is identical to it but has
@@ -211,6 +209,8 @@ module StatVal
   # raises on key conflict
   #
   def self.flatmap_hash(h, which_keys = nil, prefix=true, use_symbols=false)
+    return h.to_hash(which_keys, ! use_symbols) if h.kind_of?(StatVal)
+
     flat = {}
     h.each_pair do |k,r|
       if r.kind_of? StatVal

data/lib/statval/version.rb

@@ -1,3 +1,3 @@
 module StatVal
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/spec/lib/statval/statval_spec.rb

@@ -1,5 +1,4 @@
 require 'set'
-
 require 'statval'
 
 module StatVal
@@ -75,6 +74,11 @@ module StatVal
       ::StatVal.flatmap_hash(@it).keys.to_set.should be == [ 'a', 'num_h', 'std_h', 'min_h', 'max_h', 'avg_h' ].to_set
     end
 
+    it 'renders statvals with key renaming as if they were hashes' do
+      @it = ::StatVal.flatmap_hash(StatVal.new, ::StatVal.key_hash(nil).tap {|h| h[:max] = :susi } ).keys.to_set
+      @it.should be == ['min', 'susi', 'num', 'std', 'avg'].to_set
+    end
+
     it 'times' do
       @it = StatVal.new
       @it.time {|| sleep(2) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statval
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: script
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies: []
 description: Utility class for incrementally recording measured values and reporting
   avg, variance, min, and max
@@ -43,9 +43,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3832811953487468408
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: