distribution 0.6.0 → 0.8.0

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,89 +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
-        pending("No #{@engine}.pdf")
+        skip("No #{@engine}.pdf")
       end
     end
+  end
 
-end
-  
-shared_examples_for "Chi-square engine" do
+  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
+    end
 
-  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)
+    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
-    else
-      pending("No #{@engine}.cdf")
-    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
-      pending("No #{@engine}.p_value")
     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?
-      defined?(GSL).should be_true
+      expect(defined?(GSL)).to be
     else
-      defined?(GSL).should be_false
-    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_true
+      expect(defined?(Statistics2)).to be
     else
-      defined?(Statistics2).should be_false
-    end 
+      expect(defined?(Statistics2)).to be_nil
+    end
   end
 end

data/spec/exponential_spec.rb

@@ -1,39 +1,37 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
-  
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
+
 describe Distribution::Exponential do
-    
-  shared_examples_for "exponential engine" do
-    it "should return correct pdf" do
+  shared_examples_for 'exponential engine' do
+    it 'should return correct pdf' do
       if @engine.respond_to? :pdf
-        [0.5,1,1.5].each {|l|
+        [0.5, 1, 1.5].each {|l|
           1.upto(5) {|x|
-            @engine.pdf(x,l).should be_within(1e-10).of(l*Math.exp(-l*x))
+            expect(@engine.pdf(x, l)).to be_within(1e-10).of(l * Math.exp(-l * x))
           }
         }
       else
         pending("No #{@engine}.pdf")
       end
     end
-    
-    it "should return correct cdf" do
+
+    it 'should return correct cdf' do
       if @engine.respond_to? :cdf
-        [0.5,1,1.5].each {|l|
+        [0.5, 1, 1.5].each {|l|
           1.upto(5) {|x|
-            @engine.cdf(x,l).should be_within(1e-10).of(1-Math.exp(-l*x))
+            expect(@engine.cdf(x, l)).to be_within(1e-10).of(1 - Math.exp(-l * x))
           }
         }
       else
         pending("No #{@engine}.cdf")
       end
     end
-  
-    
-    it "should return correct p_value" do
+
+    it 'should return correct p_value' do
       if @engine.respond_to? :p_value
-        [0.5,1,1.5].each {|l|
+        [0.5, 1, 1.5].each {|l|
           1.upto(5) {|x|
-            pr=@engine.cdf(x,l)
-            @engine.p_value(pr,l).should be_within(1e-10).of(x)
+            pr = @engine.cdf(x, l)
+            expect(@engine.p_value(pr, l)).to be_within(1e-10).of(x)
           }
         }
       else
@@ -41,40 +39,51 @@ describe Distribution::Exponential do
       end
     end
   end
-  
 
-  describe "singleton" do
+  describe 'singleton' do
     before do
-      @engine=Distribution::Exponential
+      @engine = Distribution::Exponential
     end
-    it_should_behave_like "exponential engine"
+    it_should_behave_like 'exponential engine'
   end
-  
+
   describe Distribution::Exponential::Ruby_ do
     before do
-      @engine=Distribution::Exponential::Ruby_
+      @engine = Distribution::Exponential::Ruby_
     end
-    it_should_behave_like "exponential engine"
-    
+    it_should_behave_like 'exponential engine'
   end
-    
+
   if Distribution.has_gsl?
     describe Distribution::Exponential::GSL_ do
       before do
-        @engine=Distribution::Exponential::GSL_
+        @engine = Distribution::Exponential::GSL_
       end
-    it_should_behave_like "exponential engine"
+      it_should_behave_like 'exponential engine'
+    end
+  end
+
+  #  if Distribution.has_java?
+  #    describe Distribution::Exponential::Java_ do
+  #      before do
+  #        @engine=Distribution::Exponential::Java_
+  #      end
+  #    it_should_behave_like "exponential engine"
+  #
+  #    end
+  #  end
+  describe 'rng' do
+    it 'should default to Kernel#rand if no :random is given' do
+      allow(Random).to receive(:rand).and_return(0.5)
+      rng = Distribution::Exponential.rng 1.0
+      rng.call
+    end
+
+    it 'should use a given rng if one is passed during construction' do
+      random = double('random')
+      allow(random).to receive(:rand).and_return(0.5)
+      rng = Distribution::Exponential.rng 1.0, random: random
+      rng.call
     end
   end
-  
-#  if Distribution.has_java?
-#    describe Distribution::Exponential::Java_ do
-#      before do
-#        @engine=Distribution::Exponential::Java_
-#      end
-#    it_should_behave_like "exponential engine"
-#    
-#    end  
-#  end
-  
 end

data/spec/f_spec.rb

@@ -1,107 +1,109 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 
 include ExampleWithGSL
 
 describe Distribution::F do
-shared_examples_for "F engine(with rng)" do
-  it "should return correct rng" do
-  pending()
+  shared_examples_for 'F engine (with rng)' do
+    it 'should return correct rng' do
+      pending
+    end
   end
-end
 
-shared_examples_for "F engine(with pdf)" do
-  it_only_with_gsl "should return correct pdf" do
-    if @engine.respond_to? :pdf
-      [0.1,0.5,1,2,10,20,30].each{|f|
-      [2,5,10].each{|n2|
-      [2,5,10].each{|n1|
-      @engine.pdf(f,n1,n2).should be_within(1e-4).of(GSL::Ran.fdist_pdf(f,n1,n2))
-      }
-      }
-      }
-    else
-      pending("No #{@engine}.pdf")
+  shared_examples_for 'F engine (with pdf)' do
+    it_only_with_gsl 'should return correct pdf' do
+      if @engine.respond_to? :pdf
+        [0.1, 0.5, 1, 2, 10, 20, 30].each do |x|
+          [2, 5, 10].product([2, 5, 10]).each do |n, m|
+            expected_value = GSL::Ran.fdist_pdf(x, n, m)
+            expect(@engine.pdf(x, n, m)).to be_within(1e-4).of(expected_value)
+          end
+        end
+      else
+        pending("No #{@engine}.pdf")
+      end
     end
   end
-end
 
-shared_examples_for "F engine" do
-  
-  it_only_with_gsl "should return correct cdf" do
-    if @engine.respond_to? :cdf
-      [0.1,0.5,1,2,10,20,30].each{|f|
-      [2,5,10].each{|n2|
-      [2,5,10].each{|n1|
-      @engine.cdf(f,n1,n2).should be_within(1e-4).of(GSL::Cdf.fdist_P(f,n1,n2))
-      
-      }
-      }
-      }
-    else
-      pending("No #{@engine}.cdf")
+  shared_examples_for 'F engine' do
+    it_only_with_gsl 'should return correct cdf' do
+      if @engine.respond_to? :cdf
+        [0.1, 0.5, 1, 2, 10, 20, 30].each do |f|
+          [2, 5, 10].each do |n2|
+            [2, 5, 10].each do |n1|
+              expect(@engine.cdf(f, n1, n2)).to be_within(1e-4).of(GSL::Cdf.fdist_P(f, n1, n2))
+            end
+          end
+        end
+      else
+        pending("No #{@engine}.cdf")
+      end
     end
-  
-  end
-  it_only_with_gsl "should return correct p_value" do
-    if @engine.respond_to? :p_value
-  
-    [0.1,0.5,1,2,10,20,30].each{|f|
-    [2,5,10].each{|n2|
-    [2,5,10].each{|n1|
-    area=@engine.cdf(f,n1,n2)
-    @engine.p_value(area,n1,n2).should be_within(1e-4).of(GSL::Cdf.fdist_Pinv(area,n1,n2))
-    }
-    }
-    }
-  
-    
-    else
-      pending("No #{@engine}.p_value")
+
+    it_only_with_gsl 'should return correct p_value', focus: true do
+      if @engine.respond_to? :p_value
+
+        expected_value = GSL::Cdf.fdist_Pinv(0.975, 5, 4.189092917592713)
+        expect(@engine.p_value(0.975, 5, 4.189092917592713)).to be_within(1e-4).of(expected_value)
+
+        [0.1, 0.5, 1, 2, 10, 20, 30].each do |f|
+          [2, 5, 10].each do |n2|
+            [2, 5, 10].each do |n1|
+              area = @engine.cdf(f, n1, n2)
+              expected_value = GSL::Cdf.fdist_Pinv(area, n1, n2)
+
+              expect(@engine.p_value(area, n1, n2)).to be_within(1e-4).of(expected_value)
+            end
+          end
+        end
+      else
+        pending("No #{@engine}.p_value")
+      end
     end
   end
-end
 
-  describe "singleton" do
+  describe 'singleton' do
     before do
-      @engine=Distribution::F
+      @engine = Distribution::F
     end
-    it_should_behave_like "F engine"    
-    it_should_behave_like "F engine(with pdf)"    
+
+    it_should_behave_like 'F engine'
+    it_should_behave_like 'F engine (with pdf)'
   end
-  
+
   describe Distribution::F::Ruby_ do
     before do
-      @engine=Distribution::F::Ruby_
+      @engine = Distribution::F::Ruby_
     end
-    it_should_behave_like "F engine"    
-    it_should_behave_like "F engine(with pdf)"    
+    it_should_behave_like 'F engine'
+    it_should_behave_like 'F engine (with pdf)'
   end
+
   if Distribution.has_gsl?
     describe Distribution::F::GSL_ do
       before do
-        @engine=Distribution::F::GSL_
+        @engine = Distribution::F::GSL_
       end
-    it_should_behave_like "F engine"    
-    it_should_behave_like "F engine(with pdf)"    
+      it_should_behave_like 'F engine'
+      it_should_behave_like 'F engine (with pdf)'
     end
-  end  
+  end
+
   if Distribution.has_statistics2?
     describe Distribution::F::Statistics2_ do
       before do
-        @engine=Distribution::F::Statistics2_
+        @engine = Distribution::F::Statistics2_
       end
-    it_should_behave_like "F engine"    
-    end  
+      it_should_behave_like 'F engine'
+    end
   end
-  
+
   if Distribution.has_java?
     describe Distribution::F::Java_ do
       before do
-        @engine=Distribution::F::Java_
+        @engine = Distribution::F::Java_
       end
-    it_should_behave_like "F engine"    
-    it_should_behave_like "F engine(with pdf)"    
-    end  
+      it_should_behave_like 'F engine'
+      it_should_behave_like 'F engine (with pdf)'
+    end
   end
-  
 end