skab 0.1.2 → 0.2.0

data/lib/skab/models.rb

@@ -1,4 +1,5 @@
 module Skab
+  require ROOT + '/skab/models/base'
   require ROOT + '/skab/models/poisson'
   require ROOT + '/skab/models/binomial'
   

data/lib/skab/models/base.rb

@@ -0,0 +1,25 @@
+module Skab
+  module Models
+    class Base
+
+      private
+
+      def factorial(n)
+        @_factorials ||= {
+          0 => 1,
+          1 => 1
+        }
+
+        raise "Illegal factorial, expecting n > 0" if n < 0
+
+        last = @_factorials.keys.last
+        (last..n).each do |i|
+          @_factorials[i] = i * @_factorials[i - 1]
+        end
+
+        return @_factorials[n]
+      end
+
+    end
+  end
+end

data/lib/skab/models/binomial.rb

@@ -27,7 +27,9 @@ module Skab
         i = 0.0
         while i <= 1000
           @distribution[i][1] /= sums[1]
+          @distribution[i][1] *= 1000
           @distribution[i][2] /= sums[2]
+          @distribution[i][2] *= 1000
           i += 1
         end
         @distribution
@@ -40,7 +42,7 @@ module Skab
         while i <= 1000
           j = 0.0
           while j <= 1000
-            @differential[(j - i) / 1000] += distribution[j][2] * distribution[i][1]
+            @differential[(j - i) / 1000] += distribution[j][2] * distribution[i][1] / 1000
             j += 1
           end
           i += 1
@@ -48,6 +50,17 @@ module Skab
         @differential
       end
 
+      def percentile(p)
+        sum = 0.0
+        Hash[differential.sort].each do |k, v|
+          sum += v
+          if sum >= p * 1000
+            return k
+          end
+        end
+        percentile
+      end
+
       def self.help
         <<-HELP
 skab [output] binomial [trials_a] [successes_a] [trials_b] [successes_b]
@@ -70,11 +83,6 @@ skab [output] binomial [trials_a] [successes_a] [trials_b] [successes_b]
       def binomial_coef(n, k)
         factorial(n) / (factorial(k) * factorial(n - k))
       end
-
-      def factorial(n)
-        return @fact[n] if @fact[n]
-        @fact[n] = (n > 1) ? n * factorial(n - 1) : 1
-      end
     end
   end
 end

data/lib/skab/models/poisson.rb

@@ -1,6 +1,6 @@
 module Skab
   module Models
-    class Poisson
+    class Poisson < Base
 
       def initialize(args)
         @a = args.shift.to_i
@@ -31,6 +31,17 @@ module Skab
         @differential
       end
 
+      def percentile(p)
+        sum = 0.0
+        Hash[differential.sort].each do |k, v|
+          sum += v
+          if sum >= p
+            return k
+          end
+        end
+        percentile
+      end
+
       def self.help
         <<-USAGE
 skab [output] poisson [a] [b]
@@ -54,11 +65,6 @@ skab [output] poisson [a] [b]
       def poisson(k, delta)
         ((delta ** k) * Math.exp(-delta)) / factorial(k)
       end
-
-      def factorial(n)
-        return @fact[n] if @fact[n]
-        @fact[n] = (n > 1) ? n * fact(n - 1) : 1
-      end
     end
   end
 end

data/lib/skab/output/summary.rb

@@ -6,18 +6,8 @@ module Skab
       end
 
       def output(model)
-        sum = 0.0
-        min = 0
-        max = 0
-        Hash[model.differential.sort].each do |k, v|
-          sum += v
-          if min == 0 || sum <= 0.05
-            min = k
-          end
-          if max == 0 && sum >= 0.95
-            max = k
-          end
-        end
+        min = model.percentile(0.05)
+        max = model.percentile(0.95)
 
         @out.puts "The difference is located between #{min} and #{max} (90% confidence)"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skab
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
-dependencies: []
+date: 2013-05-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: vivien@songkick.com
 executables:
@@ -30,6 +46,7 @@ files:
 - lib/skab/output.rb
 - lib/skab/models/binomial.rb
 - lib/skab/models/poisson.rb
+- lib/skab/models/base.rb
 - lib/skab/models.rb
 homepage: http://github.com/songkick/skab
 licenses: []