simple-statistics 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/simple-statistics.rb

@@ -1,4 +1,6 @@
-module SimpleStatistics; end
+module SimpleStatistics
+  AGGREGATE_FUNCTIONS = [:mean, :max, :min, :count, :sum] 
+end
 
 require File.expand_path(File.join(File.dirname(__FILE__), '/simple_statistics/autoload'))
 

data/lib/simple_statistics/data.rb

@@ -8,12 +8,20 @@ module SimpleStatistics
       end
     
       def full?
-        not data.any? { |s| s.nil? }
+        not @data.any? { |s| s.nil? }
       end
     
       def mean
         sum.to_f/count
       end
+      
+      def max
+        @data.max
+      end
+      
+      def min
+        @data.min
+      end
     
       def count
         @data.compact.size
@@ -41,35 +49,48 @@ module SimpleStatistics
     
     def [](key)
       @probes ||= {}
-      @probes[key.to_sym] ||= []
+      @probes[key.to_sym] ||= {}
       DataProxy.new(self, key.to_sym)
     end
+    
+    def tick(key)
+      current_time = Time.now
+      @current_tick[key.to_sym] = current_time
+      @probes[key.to_sym] ||= {}
+      @probes[key.to_sym][current_time] = nil
+    end
 
     def initialize(keep_probes = 20)
       @probes = {}
       @keep_probes = keep_probes
+      @current_tick = {}
     end
     
     def add_probe(key, value)
       @probes ||= {}
-      @probes[key.to_sym] ||= []
-      @probes[key.to_sym] << [value, Time.now]
+      @probes[key.to_sym] ||= {}
+      if !@current_tick || !@current_tick[key.to_sym]
+        raise "You should call #tick first"
+      end
+      @probes[key.to_sym][@current_tick[key.to_sym]] = value
       if @keep_probes.to_i > 0 and @probes[key.to_sym].size > @keep_probes
-        @probes[key.to_sym].shift
+        min = @probes[key.to_sym].keys.min
+        @probes[key.to_sym].delete_if { |k,v| k ==  min }
       end
     end
   
+    def reset(key)
+      @probes ||= {}
+      @probes[key.to_sym] = {}
+    end  
+  
     def last_probes_by_count(key, num)
-      result = @probes[key.to_sym][-num..-1] || []
-      Sample.new(result.map { |p| p[0] })
+      result = @probes[key.to_sym].to_a.sort_by { |k| k[0] }.map{|k| k[1]}[-num..-1] || []
+      Sample.new(result)
     end
   
     def last_probes_by_time(key, time)
-      result = []
-      @probes[key.to_sym].reverse_each do |p|
-        break if p[1] < time
-        result.unshift(p[0]) 
-      end
+      result = @probes[key.to_sym].to_a.sort_by { |k| k[0] }.reject{|k| k[0] < time}.map { |k| k[1]} || []
       Sample.new(result)
     end  
   end

data/lib/simple_statistics/data_set.rb

@@ -1,6 +1,5 @@
 module SimpleStatistics
   class DataSet
-    
     class DataFinder
       class DataFinderError < StandardError; end
       
@@ -15,9 +14,11 @@ module SimpleStatistics
         self
       end
       
-      def mean
-        @aggregate = :mean
-        self
+      SimpleStatistics::AGGREGATE_FUNCTIONS.each do |aggregate|
+        define_method aggregate do
+          @aggregate = aggregate.to_sym
+          self
+        end
       end
       
       def last_probes_by_count(count)
@@ -40,7 +41,7 @@ module SimpleStatistics
           else
             raise DataFinderError, "Sample is not defined. Use :last_probes_by_count or :last_probes_by_time"
           end
-          if [:mean, :count, :sum].include?(@aggregate.to_sym)
+          if AGGREGATE_FUNCTIONS.include?(@aggregate.to_sym)
             p = p.send(@aggregate)
           else
             raise DataFinderError, "Aggregate function is not define. User one of :mean, :count, :sum"
@@ -64,6 +65,16 @@ module SimpleStatistics
       DataFinder.new(probe, self)
     end
     
+    def tick(key)
+      @datas.each do |k, data|
+        data.tick(key)
+      end
+    end
+    
+    def add_data(key)
+      self[key]
+    end
+    
     attr_reader :datas
     
     def [](key)

data/simple-statistics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple-statistics}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-08-04}
   s.description = %q{DSL for statistics}
   s.email = %q{glebpom@gmail.com}
   s.extra_rdoc_files = [

data/spec/data_set_spec.rb

@@ -4,12 +4,14 @@ describe SimpleStatistics::DataSet do
   describe "searching" do
     before :each do
       @data_set = SimpleStatistics::DataSet.new
+      {:process1 => 10, :process2 => 20, :process3 => 15}.each do |process, mem|
+        @data_set.add_data(process)
+      end
+      @now = Time.now
       10.times do |i|
-        @now = Time.now
+        Timecop.freeze(@now+i)
+        @data_set.tick(:private_mem)
         {:process1 => 10, :process2 => 20, :process3 => 15}.each do |process, mem|
-          Timecop.freeze(@now+i)
-          @data_set[process][:private_mem].add_probe(mem)
-          @data_set[process][:private_mem].add_probe(mem)
           @data_set[process][:private_mem].add_probe(mem)
         end
         Timecop.return

data/spec/data_spec.rb

@@ -8,16 +8,18 @@ describe SimpleStatistics::Data do
     
     it "should accept probes with #add_probe" do
       lambda {
+        @data.tick(:default)
         @data.add_probe(:default, 1)
       }.should_not raise_error
     end
-    
+
     describe "accessed with proxy" do
       describe "with some probes" do
         before :each do
           @now = Time.now
           100.times do |i|
             Timecop.freeze(@now+i)
+            @data.tick(:default)
             @data[:default].add_probe(i)
           end
           Timecop.return
@@ -51,6 +53,7 @@ describe SimpleStatistics::Data do
           @now = Time.now
           100.times do |i|
             Timecop.freeze(@now+i)
+            @data.tick(:default)
             @data.add_probe(:default, i)
           end
           Timecop.return
@@ -77,20 +80,5 @@ describe SimpleStatistics::Data do
         end
       end
     end
-
-    describe "searching" do
-      before :each do
-        @now = Time.now
-        10.times do |i|
-          Timecop.freeze(@now+i)
-          @data[:process1].add_probe(10)
-          @data[:process1].add_probe(20)
-          @data[:process1].add_probe(15)
-        end
-        Timecop.return
-      end
-      #processes.where(:private_mem).mean.last_probes_by_count(10.probes).is_higher_then(100_000_000) do |process|
-      
-    end
   end
 end

data/spec/sample_spec.rb

@@ -6,6 +6,7 @@ describe SimpleStatistics::Data::Sample do
     @now = Time.now
     1.upto(3) do |i|
       Timecop.freeze(@now+i)
+      @statistics.tick(:default)
       @statistics[:default].add_probe(i)
     end
     Timecop.return

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple-statistics
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Gleb Pomykalov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 +04:00
+date: 2010-08-04 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency