distribution 0.7.3 → 0.8.0

data/spec/binomial_spec.rb

@@ -1,130 +1,122 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 include ExampleWithGSL
 describe Distribution::Binomial do
-  
-shared_examples_for "binomial engine" do
-  it "should return correct pdf" do
-    if @engine.respond_to? :pdf
-      [10,100,1000].each do |n|
-        [1.quo(4),1.quo(2),3.quo(4)].each do |pr|
-          [0, 1,n/2,n-1].each do |x| 
-            exp=Math.binomial_coefficient(n,x)*pr**x*(1-pr)**(n-x)
-            obs=@engine.pdf(x,n,pr)
-            obs.should be_within(1e-5).of(exp), "For pdf(#{x},#{n},#{pr}) expected #{exp}, obtained #{obs}"
-            
+  shared_examples_for 'binomial engine' do
+    it 'should return correct pdf' do
+      if @engine.respond_to? :pdf
+        [10, 100, 1000].each do |n|
+          [1.quo(4), 1.quo(2), 3.quo(4)].each do |pr|
+            [0, 1, n / 2, n - 1].each do |x|
+              exp = Math.binomial_coefficient(n, x) * pr**x * (1 - pr)**(n - x)
+              obs = @engine.pdf(x, n, pr)
+              expect(obs).to be_within(1e-5).of(exp), "For pdf(#{x},#{n},#{pr}) expected #{exp}, obtained #{obs}"
+            end
           end
         end
+      else
+        skip("No #{@engine}.pdf")
       end
-    else
-      skip("No #{@engine}.pdf")
     end
-  end
-  it_only_with_gsl "should return correct cdf for n<=100" do
-     if @engine.respond_to? :pdf
-        [10,100].each do |n|
-          [0.25,0.5,0.75].each do |pr|
-            [1,n/2,n-1].each do |x| 
-              exp=GSL::Cdf.binomial_P(x,pr,n)
-              obs=@engine.cdf(x,n,pr)
-              exp.should be_within(1e-5).of(obs), "For cdf(#{x},#{n},#{pr}) expected #{exp}, obtained #{obs}"
+
+    it_only_with_gsl 'should return correct cdf for n<=100' do
+      if @engine.respond_to? :pdf
+        [10, 100].each do |n|
+          [0.25, 0.5, 0.75].each do |pr|
+            [1, n / 2, n - 1].each do |x|
+              exp = GSL::Cdf.binomial_P(x, pr, n)
+              obs = @engine.cdf(x, n, pr)
+              expect(exp).to be_within(1e-5).of(obs), "For cdf(#{x},#{n},#{pr}) expected #{exp}, obtained #{obs}"
             end
           end
         end
       else
         skip("No #{@engine}.cdf")
       end
+    end
   end
 
-  
-  
-end
-
-  describe "singleton" do
+  describe 'singleton' do
     before do
-      @engine=Distribution::Binomial
+      @engine = Distribution::Binomial
     end
-    it_should_behave_like "binomial engine"
-    it {@engine.should respond_to(:exact_pdf) }
+
+    it_should_behave_like 'binomial engine'
+
+    it { expect(@engine).to respond_to(:exact_pdf) }
+
     it {
-      pending("No exact_p_value")
-      @engine.should respond_to(:exact_p_value) 
+      pending('No exact_p_value')
+      expect(@engine).to respond_to(:exact_p_value)
     }
-    it "exact_cdf should return same values as cdf for n=50" do
-      pr=rand()*0.8+0.1
-      n=rand(10)+10
-      [1,(n/2).to_i,n-1].each do |k|
-       
-        @engine.exact_cdf(k,n,pr).should be_within(1e-10).of(@engine.cdf(k,n,pr))
+
+    it 'exact_cdf should return same values as cdf for n=50' do
+      pr = rand * 0.8 + 0.1
+      n = rand(10) + 10
+      [1, (n / 2).to_i, n - 1].each do |k|
+        expect(@engine.exact_cdf(k, n, pr)).to be_within(1e-10).of(@engine.cdf(k, n, pr))
       end
     end
-    
-    it "exact_pdf should not return a Float if not float is used as parameter" do
-      @engine.exact_pdf(1,1,1).should_not be_a(Float)
-      @engine.exact_pdf(16, 80, 1.quo(2)).should_not be_a(Float)
+
+    it 'exact_pdf should not return a Float if not float is used as parameter' do
+      expect(@engine.exact_pdf(1, 1, 1)).to_not be_a(Float)
+      expect(@engine.exact_pdf(16, 80, 1.quo(2))).to_not be_a(Float)
     end
-    
   end
-  
+
   describe Distribution::Binomial::Ruby_ do
     before do
-      @engine=Distribution::Binomial::Ruby_
+      @engine = Distribution::Binomial::Ruby_
     end
-    it_should_behave_like "binomial engine"
-    
-    it "should return correct cdf for n>100" do      
-    [500,1000].each do |n|
-      [0.5,0.6].each do |pr|
-        [n/2].each do |x| 
-          cdf=@engine.exact_cdf(x,n,pr)
-          p_value=@engine.p_value(cdf,n,pr)
-          p_value.should eq(x), "For p_value(#{cdf},#{n},#{pr}) expected #{x}, obtained #{p_value}"
+    it_should_behave_like 'binomial engine'
+
+    it 'should return correct cdf for n>100' do
+      [500, 1000].each do |n|
+        [0.5, 0.6].each do |pr|
+          [n / 2].each do |x|
+            cdf = @engine.exact_cdf(x, n, pr)
+            p_value = @engine.p_value(cdf, n, pr)
+            msg = "For p_value(#{cdf},#{n},#{pr}) expected #{x}, obtained #{p_value}"
+
+            expect(p_value).to eq(x), msg
+          end
         end
       end
     end
-      
-    end
-    
-    it "should return correct p_value for n<=100" do
+
+    it 'should return correct p_value for n<=100' do
       pending("Can't calculate with precision x using p")
-    [10,100].each do |n|
-      [0.25,0.5,0.75].each do |pr|
-        [n/2].each do |x| 
-          cdf=@engine.cdf(x,n,pr)
-          p_value=@engine.p_value(cdf,n,pr)
-          
-          p_value.should eq(x), "For p_value(#{cdf},#{n},#{pr}) expected #{x}, obtained #{p_value}"
+
+      [10, 100].each do |n|
+        [0.25, 0.5, 0.75].each do |pr|
+          [n / 2].each do |x|
+            cdf = @engine.cdf(x, n, pr)
+            p_value = @engine.p_value(cdf, n, pr)
+
+            msg = "For p_value(#{cdf},#{n},#{pr}) expected #{x}, obtained #{p_value}"
+            expect(p_value).to eq(x), msg
+          end
         end
       end
     end
-    end
-    
   end
+
   if Distribution.has_gsl?
     describe Distribution::Binomial::GSL_ do
       before do
-        @engine=Distribution::Binomial::GSL_
+        @engine = Distribution::Binomial::GSL_
       end
-    it_should_behave_like "binomial engine"
+
+      it_should_behave_like 'binomial engine'
     end
   end
-  #if Distribution.has_statistics2?
-  #  describe Distribution::Binomial::Statistics2_ do
-  #    
-  #    before do
-  #      @engine=Distribution::Binomial::Statistics2_
-  #    end
-    #it_should_behave_like "binomial engine"
-  #  end  
-  #end
-  
+
   if Distribution.has_java?
     describe Distribution::Binomial::Java_ do
       before do
-        @engine=Distribution::Binomial::Java_
+        @engine = Distribution::Binomial::Java_
       end
-    it_should_behave_like "binomial engine"
-    
-    end  
+
+      it_should_behave_like 'binomial engine'
+    end
   end
-  
 end

data/spec/bivariatenormal_spec.rb

@@ -1,63 +1,56 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 include ExampleWithGSL
 describe Distribution::BivariateNormal do
-  shared_examples_for "all pdf normal capables engines" do
-    it_only_with_gsl "should return correct pdf" do
+  shared_examples_for 'all pdf normal capables engines' do
+    it_only_with_gsl 'should return correct pdf' do
       if @engine.respond_to? :pdf
-        [0.2,0.4,0.6,0.8,0.9, 0.99,0.999,0.999999].each {|rho|
-          @engine.pdf(0,0, rho , 1,1).should be_within(1e-8).of(GSL::Ran::bivariate_gaussian_pdf(0, 0, 1,1,rho))
+        [0.2, 0.4, 0.6, 0.8, 0.9, 0.99, 0.999, 0.999999].each {|rho|
+          expect(@engine.pdf(0, 0, rho, 1, 1)).to be_within(1e-8).of(GSL::Ran.bivariate_gaussian_pdf(0, 0, 1, 1, rho))
         }
       else
         pending("No #{@engine}.pdf")
       end
     end
   end
-  
-  shared_examples_for "all cdf normal capables engines" do
-    it "should return correct cdf" do
+
+  shared_examples_for 'all cdf normal capables engines' do
+    it 'should return correct cdf' do
       if @engine.respond_to? :cdf
-        @engine.cdf(2,0.5,0.5).should be_within(1e-3).of(0.686)
-        @engine.cdf(2,0.0,0.5).should be_within(1e-3).of(0.498)
-        @engine.cdf(1.5,0.5,0.5).should be_within(1e-3).of(0.671)
-        v=rand
-        @engine.cdf(10,0,v).should be_within(1e-3).of(Distribution::Normal.cdf(0))
+        expect(@engine.cdf(2, 0.5, 0.5)).to be_within(1e-3).of(0.686)
+        expect(@engine.cdf(2, 0.0, 0.5)).to be_within(1e-3).of(0.498)
+        expect(@engine.cdf(1.5, 0.5, 0.5)).to be_within(1e-3).of(0.671)
+        v = rand
+        expect(@engine.cdf(10, 0, v)).to be_within(1e-3).of(Distribution::Normal.cdf(0))
       else
-          pending("No #{@engine}.cdf")
-        
+        pending("No #{@engine}.cdf")
+
       end
     end
-    
   end
-  describe "singleton" do
+  describe 'singleton' do
     before do
-      @engine=Distribution::BivariateNormal
+      @engine = Distribution::BivariateNormal
     end
-    it_should_behave_like "all pdf normal capables engines"    
-    it_should_behave_like "all cdf normal capables engines"    
-    
+    it_should_behave_like 'all pdf normal capables engines'
+    it_should_behave_like 'all cdf normal capables engines'
   end
-  
+
   describe Distribution::Normal::Ruby_ do
     before do
-      @engine=Distribution::BivariateNormal::Ruby_
+      @engine = Distribution::BivariateNormal::Ruby_
     end
-    it_should_behave_like "all pdf normal capables engines"    
-    it_should_behave_like "all cdf normal capables engines"    
-    it "Ganz method should return similar method to Hull one" do
-      [-3,-2,-1,0,1,1.5].each {|x|      
-        @engine.cdf_hull(x,x,0.5).should be_within(0.001).of(@engine.cdf_genz(x,x,0.5))
-
+    it_should_behave_like 'all pdf normal capables engines'
+    it_should_behave_like 'all cdf normal capables engines'
+    it 'Ganz method should return similar method to Hull one' do
+      [-3, -2, -1, 0, 1, 1.5].each {|x|
+        expect(@engine.cdf_hull(x, x, 0.5)).to be_within(0.001).of(@engine.cdf_genz(x, x, 0.5))
       }
     end
-    
   end
   describe Distribution::Normal::GSL_ do
     before do
-      @engine=Distribution::BivariateNormal::GSL_
+      @engine = Distribution::BivariateNormal::GSL_
     end
-    it_should_behave_like "all pdf normal capables engines"    
-
+    it_should_behave_like 'all pdf normal capables engines'
   end
-  
-  
 end

data/spec/chisquare_spec.rb

@@ -1,90 +1,86 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 include ExampleWithGSL
 describe Distribution::ChiSquare do
-
-shared_examples_for "Chi-square engine(with pdf)" do
-    it_only_with_gsl "should return correct pdf" do
+  shared_examples_for 'Chi-square engine(with pdf)' do
+    it_only_with_gsl 'should return correct pdf' do
       if @engine.respond_to? :pdf
         1.upto(10) do |k|
-          v=1+rand(5)
-          chi=GSL::Ran.chisq_pdf(v,k)
-          @engine.pdf(v,k).should be_within(10e-10).of(chi)
+          v = 1 + rand(5)
+          chi = GSL::Ran.chisq_pdf(v, k)
+          expect(@engine.pdf(v, k)).to be_within(10e-10).of(chi)
         end
       else
         skip("No #{@engine}.pdf")
       end
     end
+  end
 
-end
-  
-shared_examples_for "Chi-square engine" do
-
-  it_only_with_gsl "should return correct cdf" do
-    if @engine.respond_to? :cdf
-      1.upto(10) do |k|
-        v=1+rand(5)
-        chi=GSL::Cdf::chisq_P(v,k)
-        @engine.cdf(v,k).should be_within(10e-10).of(chi)
+  shared_examples_for 'Chi-square engine' do
+    it_only_with_gsl 'should return correct cdf' do
+      if @engine.respond_to? :cdf
+        1.upto(10) do |k|
+          v = 1 + rand(5)
+          chi = GSL::Cdf.chisq_P(v, k)
+          expect(@engine.cdf(v, k)).to be_within(10e-10).of(chi)
+        end
+      else
+        skip("No #{@engine}.cdf")
       end
-    else
-      skip("No #{@engine}.cdf")
-    end  
-  end
+    end
 
-  it "should return correct p_value" do
-    if @engine.respond_to? :p_value
-      1.upto(10) do |k|
-        v=1+rand(5)
-        pr=@engine.cdf(v,k)
-        @engine.p_value(pr,k).should be_within(10e-4).of(v)
-       end
-    else
-      skip("No #{@engine}.p_value")
+    it 'should return correct p_value' do
+      if @engine.respond_to? :p_value
+        1.upto(10) do |k|
+          v = 1 + rand(5)
+          pr = @engine.cdf(v, k)
+          expect(@engine.p_value(pr, k)).to be_within(10e-4).of(v)
+        end
+      else
+        skip("No #{@engine}.p_value")
+      end
     end
   end
-end
 
-  describe "singleton" do
+  describe 'singleton' do
     before do
-      @engine=Distribution::ChiSquare
+      @engine = Distribution::ChiSquare
     end
-    it_should_behave_like "Chi-square engine"
-    it_should_behave_like "Chi-square engine(with pdf)"    
+    it_should_behave_like 'Chi-square engine'
+    it_should_behave_like 'Chi-square engine(with pdf)'
   end
-  
+
   describe Distribution::ChiSquare::Ruby_ do
     before do
-      @engine=Distribution::ChiSquare::Ruby_
+      @engine = Distribution::ChiSquare::Ruby_
     end
-    it_should_behave_like "Chi-square engine"    
-    it_should_behave_like "Chi-square engine(with pdf)"    
+    it_should_behave_like 'Chi-square engine'
+    it_should_behave_like 'Chi-square engine(with pdf)'
   end
   if Distribution.has_gsl?
     describe Distribution::ChiSquare::GSL_ do
       before do
-        @engine=Distribution::ChiSquare::GSL_
+        @engine = Distribution::ChiSquare::GSL_
       end
-    it_should_behave_like "Chi-square engine"    
-    it_should_behave_like "Chi-square engine(with pdf)"    
+      it_should_behave_like 'Chi-square engine'
+      it_should_behave_like 'Chi-square engine(with pdf)'
     end
-  end  
+  end
   if Distribution.has_statistics2?
     describe Distribution::ChiSquare::Statistics2_ do
       before do
-        @engine=Distribution::ChiSquare::Statistics2_
+        @engine = Distribution::ChiSquare::Statistics2_
       end
-    it_should_behave_like "Chi-square engine"    
-    end  
+      it_should_behave_like 'Chi-square engine'
+    end
   end
-  
+
   if Distribution.has_java?
     describe Distribution::ChiSquare::Java_ do
       before do
-        @engine=Distribution::ChiSquare::Java_
+        @engine = Distribution::ChiSquare::Java_
       end
-    it_should_behave_like "Chi-square engine"    
-    it_should_behave_like "Chi-square engine(with pdf)"    
-    end  
+      it_should_behave_like 'Chi-square engine'
+      it_should_behave_like 'Chi-square engine(with pdf)'
+    end
   end
-  
 end

data/spec/distribution_spec.rb

@@ -1,19 +1,19 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 describe Distribution do
-  it "should respond to has_gsl?" do
-    lambda {Distribution.has_gsl?}.should_not raise_exception
+  it 'should respond to has_gsl?' do
+    lambda { Distribution.has_gsl? }.should_not raise_exception
     if Distribution.has_gsl?
       expect(defined?(GSL)).to be
     else
-      defined?(GSL).should be_nil
-    end 
+      expect(defined?(GSL)).to be_nil
+    end
   end
-  it "should respond to has_statistics2?" do
-    lambda {Distribution.has_statistics2?}.should_not raise_exception
+  it 'should respond to has_statistics2?' do
+    lambda { Distribution.has_statistics2? }.should_not raise_exception
     if Distribution.has_statistics2?
-      defined?(Statistics2).should be
+      expect(defined?(Statistics2)).to be
     else
-      defined?(Statistics2).should be_nil
-    end 
+      expect(defined?(Statistics2)).to be_nil
+    end
   end
 end