integration 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad161dae6d8cd737f33db6844ab3f345c95fb82
-  data.tar.gz: d098810e0c476442e1495586d229251fffd37d9c
+  metadata.gz: 437b8e5c01a17b8168d503e3053429e5df10238c
+  data.tar.gz: 4b8fde1abeece2e42932cda9fa06779ee08ea274
 SHA512:
-  metadata.gz: e2ad2678eb811bf5ae28f81e1d7e59fa118b4bef2ba995155f9ac3be109ee9caca9ea54479f86924e49edbf5fcacbf2c8831f6cf64d53b562df7e8af2b75791c
-  data.tar.gz: d258396d5f21736dd665afc554b2b086cb39ab4126f996fd77ddf7bd54c1c0b11e62cb02a02b5457d8e765cac9e1311e5d6d629ce8145aacebfd066dcca56280
+  metadata.gz: 10f8aa27944b66c5e0817f3e6f9b18fc948be1539aef46931ac1ea803c869f243bb91b097a0edd6433cdafdce5728dc6dca9a32109ed6208cba1b65c6b66b47d
+  data.tar.gz: 92b5bcc05f2438e3d4c301119d984e82074353ca6e03975eaf972bc39669584e07a038479f9f38fc8a1370708b82d23cec228bb686333343a3c5726c750df871

data/.gitignore

@@ -1,3 +1,4 @@
 *~
+Gemfile.lock
 coverage/*
 pkg/*

data/.travis.yml

@@ -1,15 +1,16 @@
 language: ruby
 rvm:
-  - '1.9.3'
-  - '2.0.0'
-  - '2.1.1'
+  - 1.9.3
+  - 2.0
+  - 2.1
+  - 2.2
 #  - jruby-19mode # JRuby in 1.9 mode -> Problems with bigint
 #  - rbx-19mode
 # script: bundle exec rspec spec
 
 script:
-  bundle exec rspec
-  
+  bundle exec rake spec
+
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y libgsl0-dev

data/README.md

@@ -1,60 +1,74 @@
-# integration
+# Integration
 
-* http://github.com/clbustos/integration
+[![Build Status](https://travis-ci.org/SciRuby/integration.svg?branch=master)](https://travis-ci.org/SciRuby/integration)
+[![Code Climate](https://codeclimate.com/github/SciRuby/integration/badges/gpa.svg)](https://codeclimate.com/github/SciRuby/integration)
 
-## DESCRIPTION:
+Numerical integration for Ruby, with a simple interface. Several different integration methods are implemented.
 
-Numerical integration for Ruby, with a simple interface
+## Installation
 
-## FEATURES/PROBLEMS:
+```bash
+$ gem install integration
+```
+
+You can install GSL (please use your package manager) for better performance and support for infinite bounds. After successfully installing the library:
+
+```bash
+$ gem install rb-gsl
+```
+
+## Documentation
+
+You can see the latest documentation for Integration at Rubydoc: [rubydoc.info/github/sciruby/integration](http://www.rubydoc.info/github/sciruby/integration).
+
+## Features
 
 * Use only one method: Integration.integrate
-* Rectangular, Trapezoidal, Simpson, Adaptive quadrature, Monte Carlo and Romberg integration methods available on pure Ruby. 
-* If available, uses Ruby/GSL QNG non-adaptive Gauss-Kronrod integration and QAG adaptive integration, with support for Infinity+ and Infinity- 
-
-
-## SYNOPSIS:
-
-  Integration.integrate(1,2,{:tolerance=>1e-10,:method=>:simpson}) {|x| x**2} => 2.333333
-  
-  # Support for infinity bounds with GSL QAG adaptative integration
-  
-  normal_pdf=lambda {|x| (1/Math.sqrt(2*Math::PI))*Math.exp(-(x**2/2))}
-  Integration.integrate(Integration::MInfinity, 0 , {:tolerance=>1e-10}, &normal_pdf) => 0.5
-  Integration.integrate(0, Integration::Infinity , {:tolerance=>1e-10}, &normal_pdf) => 0.5
-  
-## REQUIREMENTS:
-
-* Ruby/GSL, for better performance and support for infinite bounds
-
-## INSTALL:
-
-  gem install integration
-  
-## LICENSE:
-
-    Copyright (c) 2005  Beng
-                  2011.2014  clbustos
-    
-    Permission is hereby granted, free of charge, to any person obtaining a
-    copy of this software and associated documentation files (the "Software"),
-    to deal in the Software without restriction, including without limitation
-    the rights to use, copy, modify, merge, publish, distribute, sublicense,
-    and/or sell copies of the Software, and to permit persons to whom the
-    Software is furnished to do so, subject to the following conditions:
-    
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-    
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-    THE DEVELOPERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-    OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-    
-    Except as contained in this notice, the name of the Beng shall not
-    be used in advertising or otherwise to promote the sale, use or other dealings
-    in this Software without prior written authorization from Beng.
+* Rectangular, Trapezoidal, Simpson, Adaptive quadrature, Monte Carlo and Romberg integration methods available on pure Ruby.
+* If available, uses Ruby/GSL QNG non-adaptive Gauss-Kronrod integration and QAG adaptive integration, with support for Infinity+ and Infinity-
+
+## Examples
+
+```ruby
+# Integrate x^2 in [1, 2] using Simpson's rule.
+Integration.integrate(1, 2, tolerance: 1e-10, method: :simpson) do |x|
+  x**2
+end
+# => 2.333333
+
+# Support for infinity bounds with GSL QAG adaptative integration.
+
+normal_pdf = lambda do |x|
+  (1 / Math.sqrt(2 * Math::PI)) * Math.exp(-0.5 * (x**2))
+end
+
+Integration.integrate(Integration::MInfinity, 0, tolerance: 1e-10, &normal_pdf) # => 0.5
+Integration.integrate(0, Integration::Infinity , tolerance: 1e-10, &normal_pdf) # => 0.5
+```
+
+## License
+
+Copyright (c) 2005  Beng
+              2011-2015  clbustos
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE DEVELOPERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
 
+Except as contained in this notice, the name of the Beng shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from Beng.

data/Rakefile

@@ -1,14 +1,9 @@
-# -*- ruby -*-
-$:.unshift(File.expand_path(File.dirname(__FILE__)+"/lib/"))
-require 'rubygems'
-require 'integration'
-require 'bundler'
-
-Bundler::GemHelper.install_tasks
-
-
-gemspec = eval(IO.read("integration.gemspec"))
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
+require 'integration/version'
+require 'bundler'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 begin
   Bundler.setup(:default, :development)
@@ -18,28 +13,13 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-
-
-require "rubygems/package_task"
-Gem::PackageTask.new(gemspec).define
-
-desc "install the gem locally"
-task :install => [:package] do
-  sh %{gem install pkg/integration-#{Integration::VERSION}.gem}
-end
-
-require 'rspec/core/rake_task'
-require 'rspec/core'
-require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-
 desc "Open an irb session preloaded with integration"
 task :console do
   sh "irb -rubygems -I lib -r integration.rb"
 end
 
 task :default => :spec
-# vim: syntax=ruby

data/integration.gemspec

@@ -1,16 +1,15 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
 
+require 'integration/version'
 
 Gem::Specification.new do |s|
   s.name = "integration"
-  s.version = "0.1.1"
+  s.version = Integration::VERSION
   s.authors = ["Claudio Bustos","Ben Gimpert"]
   s.description = "Numerical integration for Ruby, with a simple interface"
   s.email = ["clbustos@gmail.com", "No Email"]
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features,benchmark}/*`.split("\n")  
+  s.test_files    = `git ls-files -- {test,spec,features,benchmark}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.summary = "A suite for integration in Ruby"

data/lib/integration.rb

@@ -7,10 +7,10 @@
 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
 # and/or sell copies of the Software, and to permit persons to whom the
 # Software is furnished to do so, subject to the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be included in
 # all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -18,33 +18,32 @@
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
 # OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-# 
+#
 # Except as contained in this notice, the name of the Beng shall not
 # be used in advertising or otherwise to promote the sale, use or other dealings
 # in this Software without prior written authorization from Beng.
 
 # Diverse integration methods
 # Use Integration.integrate as wrapper to direct access to methods
-# 
-# Method API 
+#
+# Method API
 #
 
 class Integration
-  VERSION = '0.2.0'
   # Minus Infinity
   MInfinity=:minfinity
   # Infinity
   Infinity=:infinity
   class << self
-    
+
     # Create a method 'has_<library>' on Module
     # which require a library and return true or false
-    # according to success of failure 
+    # according to success of failure
     def create_has_library(library) #:nodoc:
       define_singleton_method("has_#{library}?") do
         cv="@@#{library}"
         if !class_variable_defined? cv
-          begin 
+          begin
             require library.to_s
             class_variable_set(cv, true)
           rescue LoadError
@@ -60,7 +59,7 @@ class Integration
     #   * Ayres : Outline of calculus
     def rectangle(t1, t2, n, &f)
       d=(t2-t1) / n.to_f
-      n.times.inject(0) {|ac,i| 
+      n.times.inject(0) {|ac,i|
         ac+f[t1+d*(i+0.5)]
       }*d
     end
@@ -72,35 +71,44 @@ class Integration
     def trapezoid(t1, t2, n, &f)
       d=(t2-t1) / n.to_f
       (d/2.0)*(f[t1]+
-      2*(1..(n-1)).inject(0){|ac,i| 
+      2*(1..(n-1)).inject(0){|ac,i|
       ac+f[t1+d*i]
       }+f[t2])
     end
+
     # Simpson's rule
     # +n+ implies number of subdivisions
     # Source:
     #   * Ayres : Outline of calculus
     def simpson(t1, t2, n, &f)
       n += 1 unless n % 2 == 0
-      d=(t2-t1) / n.to_f      
+      d=(t2-t1) / n.to_f
       out= (d / 3.0)*(f[t1.to_f].to_f+
       ((1..(n-1)).inject(0) {|ac,i|
-        ac+((i%2==0) ? 2 : 4)*f[t1+d*i]  
+        ac+((i%2==0) ? 2 : 4)*f[t1+d*i]
       })+f[t2.to_f].to_f)
       out
     end
-    # TODO: Document method
+
+    # Simpson's 3/8 Rule
+    # +n+ implies number of subdivisions
+    # Source:
+    #   * Burden, Richard L. and Faires, J. Douglas (2000): Numerical Analysis (7th ed.). Brooks/Cole
     def simpson3by8(t1, t2, n, &f)
-      d = (t2-t1) / n.to_f 
+      d = (t2-t1) / n.to_f
       ac = 0
       (0..n-1).each do |i|
         ac+=(d/8.0)*(f[t1+i*d]+3*f[t1+i*d+d/3]+3*f[t1+i*d+2*d/3]+f[t1+(i+1)*d])
       end
       ac
     end
-    # TODO: Document method
+
+    # Boole's Rule
+    # +n+ implies number of subdivisions
+    # Source:
+    # Weisstein, Eric W. "Boole's Rule." From MathWorld—A Wolfram Web Resource
     def boole(t1, t2, n, &f)
-      d = (t2-t1) / n.to_f 
+      d = (t2-t1) / n.to_f
       ac = 0
       (0..n-1).each do |i|
         ac+=(d/90.0)*(7*f[t1+i*d]+32*f[t1+i*d+d/4]+12*f[t1+i*d+d/2]+32*f[t1+i*d+3*d/4]+7*f[t1+(i+1)*d])
@@ -108,26 +116,38 @@ class Integration
       ac
     end
 
-    # TODO: Document method
+    # Open Trapezoid method
+    # +n+ implies number of subdivisions
+    # Values computed at mid point and end point instead of starting points
     def open_trapezoid(t1, t2, n, &f)
-      d = (t2-t1) / n.to_f 
+      d = (t2-t1) / n.to_f
       ac = 0
       (0..n-1).each do |i|
         ac+=(d/2.0)*(f[t1+i*d+d/3]+f[t1+i*d+2*d/3])
       end
       ac
     end
-    # TODO: Document method
+
+    # Milne's Method
+    # +n+ implies number of subdivisions
+    # Source:
+    # Abramowitz, M. and Stegun, I. A. (Eds.).
+    # Handbook of Mathematical Functions with Formulas, Graphs, and Mathematical Tables,
+    # 9th printing. New York: Dover, pp. 896-897, 1972.
     def milne(t1, t2, n, &f)
-      d = (t2-t1) / n.to_f 
+      d = (t2-t1) / n.to_f
       ac = 0
       (0..n-1).each do |i|
         ac+=(d/3.0)*(2*f[t1+i*d+d/4]-f[t1+i*d+d/2]+2*f[t1+i*d+3*d/4])
       end
       ac
     end
-    # TODO: Document method
-    def adaptive_quadrature(a, b, tolerance)  
+
+    # Adaptive Quadrature
+    # Calls the Simpson's rule recursively on subintervals
+    # in case the error exceeds the desired tolerance
+    # +tolerance+ is the desired tolerance of error
+    def adaptive_quadrature(a, b, tolerance)
       h = (b.to_f - a) / 2
       fa = yield(a)
       fc = yield(a + h)
@@ -151,7 +171,9 @@ class Integration
       }
       return helper.call(a, b, fa, fb, fc, h, s, 1)
     end
-    # TODO: Document method
+
+    # Gaussian Quadrature
+    # n-point Gaussian quadrature rule gives an exact result for polynomials of degree 2n − 1 or less
     def gauss(t1, t2, n)
       case n
         when 1
@@ -187,50 +209,195 @@ class Integration
         else
           raise "Invalid number of spaced abscissas #{n}, should be 1-10"
       end
-      
+
       sum = 0
       (0...n).each do |i|
-        t = ((t1.to_f + t2) / 2.0) + (((t2 - t1) / 2.0) * z[i])        
+        t = ((t1.to_f + t2) / 2.0) + (((t2 - t1) / 2.0) * z[i])
         sum += w[i] * yield(t)
       end
       return ((t2 - t1) / 2.0) * sum
     end
-    # TODO: Document method
+
+    # Gauss Kronrod Rule:
+    # Provides a 3n+1 order estimate while re-using the function values of a lower-order(n order) estimate
+    # Source:
+    # "Gauss–Kronrod quadrature formula", Encyclopedia of Mathematics, Springer, ISBN 978-1-55608-010-4
     def gauss_kronrod(t1,t2,n,points)
       #g7k15
       case points
         when 15
-          z = [-0.9914553711208126, -0.9491079123427585, -0.8648644233597691, -0.7415311855993945, -0.5860872354676911, -0.4058451513773972, -0.20778495500789848, 0.0, 0.20778495500789848, 0.4058451513773972, 0.5860872354676911, 0.7415311855993945, 0.8648644233597691, 0.9491079123427585, 0.9914553711208126]
-          w = [0.022935322010529224, 0.06309209262997856, 0.10479001032225019, 0.14065325971552592, 0.1690047266392679, 0.19035057806478542, 0.20443294007529889, 0.20948214108472782, 0.20443294007529889, 0.19035057806478542, 0.1690047266392679, 0.14065325971552592, 0.10479001032225019, 0.06309209262997856, 0.022935322010529224]
+
+          z = [-0.9914553711208126, -0.9491079123427585, -0.8648644233597691,
+               -0.7415311855993945, -0.5860872354676911, -0.4058451513773972,
+               -0.20778495500789848, 0.0, 0.20778495500789848,
+               0.4058451513773972, 0.5860872354676911, 0.7415311855993945,
+               0.8648644233597691, 0.9491079123427585, 0.9914553711208126]
+
+          w = [0.022935322010529224, 0.06309209262997856, 0.10479001032225019,
+               0.14065325971552592, 0.1690047266392679, 0.19035057806478542,
+               0.20443294007529889, 0.20948214108472782, 0.20443294007529889,
+               0.19035057806478542, 0.1690047266392679, 0.14065325971552592,
+               0.10479001032225019, 0.06309209262997856, 0.022935322010529224]
+
         when 21
           #g10k21
-          z = [-0.9956571630258081, -0.9739065285171717, -0.9301574913557082, -0.8650633666889845, -0.7808177265864169, -0.6794095682990244, -0.5627571346686047, -0.4333953941292472, -0.2943928627014602, -0.14887433898163122, 0.0, 0.14887433898163122, 0.2943928627014602, 0.4333953941292472, 0.5627571346686047, 0.6794095682990244, 0.7808177265864169, 0.8650633666889845, 0.9301574913557082, 0.9739065285171717, 0.9956571630258081]
-          w = [0.011694638867371874, 0.032558162307964725, 0.054755896574351995, 0.07503967481091996, 0.0931254545836976, 0.10938715880229764, 0.12349197626206584, 0.13470921731147334, 0.14277593857706009, 0.14773910490133849, 0.1494455540029169, 0.14773910490133849, 0.14277593857706009, 0.13470921731147334, 0.12349197626206584, 0.10938715880229764, 0.0931254545836976, 0.07503967481091996, 0.054755896574351995, 0.032558162307964725, 0.011694638867371874]
+
+          z = [-0.9956571630258081, -0.9739065285171717, -0.9301574913557082,
+               -0.8650633666889845, -0.7808177265864169, -0.6794095682990244,
+               -0.5627571346686047, -0.4333953941292472, -0.2943928627014602,
+               -0.14887433898163122, 0.0, 0.14887433898163122,
+               0.2943928627014602, 0.4333953941292472, 0.5627571346686047,
+               0.6794095682990244, 0.7808177265864169, 0.8650633666889845,
+               0.9301574913557082, 0.9739065285171717, 0.9956571630258081]
+
+          w = [0.011694638867371874, 0.032558162307964725,
+               0.054755896574351995, 0.07503967481091996, 0.0931254545836976,
+               0.10938715880229764, 0.12349197626206584, 0.13470921731147334,
+               0.14277593857706009, 0.14773910490133849, 0.1494455540029169,
+               0.14773910490133849, 0.14277593857706009, 0.13470921731147334,
+               0.12349197626206584, 0.10938715880229764, 0.0931254545836976,
+               0.07503967481091996, 0.054755896574351995, 0.032558162307964725,
+               0.011694638867371874]
+
         when 31
           #g15k31
-          z = [-0.9980022986933971, -0.9879925180204854, -0.9677390756791391, -0.937273392400706, -0.8972645323440819, -0.8482065834104272, -0.790418501442466, -0.7244177313601701, -0.650996741297417, -0.5709721726085388, -0.4850818636402397, -0.3941513470775634, -0.29918000715316884, -0.20119409399743451, -0.1011420669187175, 0.0, 0.1011420669187175, 0.20119409399743451, 0.29918000715316884, 0.3941513470775634, 0.4850818636402397, 0.5709721726085388, 0.650996741297417, 0.7244177313601701, 0.790418501442466, 0.8482065834104272, 0.8972645323440819, 0.937273392400706, 0.9677390756791391, 0.9879925180204854, 0.9980022986933971]
-          w = [0.005377479872923349, 0.015007947329316122, 0.02546084732671532, 0.03534636079137585, 0.04458975132476488, 0.05348152469092809, 0.06200956780067064, 0.06985412131872826, 0.07684968075772038, 0.08308050282313302, 0.08856444305621176, 0.09312659817082532, 0.09664272698362368, 0.09917359872179196, 0.10076984552387559, 0.10133000701479154, 0.10076984552387559, 0.09917359872179196, 0.09664272698362368, 0.09312659817082532, 0.08856444305621176, 0.08308050282313302, 0.07684968075772038, 0.06985412131872826, 0.06200956780067064, 0.05348152469092809, 0.04458975132476488, 0.03534636079137585, 0.02546084732671532, 0.015007947329316122, 0.005377479872923349]
+
+          z = [-0.9980022986933971, -0.9879925180204854, -0.9677390756791391,
+               -0.937273392400706, -0.8972645323440819, -0.8482065834104272,
+               -0.790418501442466, -0.7244177313601701, -0.650996741297417,
+               -0.5709721726085388, -0.4850818636402397, -0.3941513470775634,
+               -0.29918000715316884, -0.20119409399743451, -0.1011420669187175,
+               0.0, 0.1011420669187175, 0.20119409399743451,
+               0.29918000715316884, 0.3941513470775634, 0.4850818636402397,
+               0.5709721726085388, 0.650996741297417, 0.7244177313601701,
+               0.790418501442466, 0.8482065834104272, 0.8972645323440819,
+               0.937273392400706, 0.9677390756791391, 0.9879925180204854,
+               0.9980022986933971]
+
+          w = [0.005377479872923349, 0.015007947329316122, 0.02546084732671532,
+               0.03534636079137585, 0.04458975132476488, 0.05348152469092809,
+               0.06200956780067064, 0.06985412131872826, 0.07684968075772038,
+               0.08308050282313302, 0.08856444305621176, 0.09312659817082532,
+               0.09664272698362368, 0.09917359872179196, 0.10076984552387559,
+               0.10133000701479154, 0.10076984552387559, 0.09917359872179196,
+               0.09664272698362368, 0.09312659817082532, 0.08856444305621176,
+               0.08308050282313302, 0.07684968075772038, 0.06985412131872826,
+               0.06200956780067064, 0.05348152469092809, 0.04458975132476488,
+               0.03534636079137585, 0.02546084732671532, 0.015007947329316122,
+               0.005377479872923349]
+
         when 41
           #g20k41
-          z = [-0.9988590315882777, -0.9931285991850949, -0.9815078774502503, -0.9639719272779138, -0.9408226338317548, -0.912234428251326, -0.878276811252282, -0.8391169718222188, -0.7950414288375512, -0.7463319064601508, -0.6932376563347514, -0.636053680726515, -0.5751404468197103, -0.5108670019508271, -0.4435931752387251, -0.37370608871541955, -0.301627868114913, -0.22778585114164507, -0.15260546524092267, -0.07652652113349734, 0.0, 0.07652652113349734, 0.15260546524092267, 0.22778585114164507, 0.301627868114913, 0.37370608871541955, 0.4435931752387251, 0.5108670019508271, 0.5751404468197103, 0.636053680726515, 0.6932376563347514, 0.7463319064601508, 0.7950414288375512, 0.8391169718222188, 0.878276811252282, 0.912234428251326, 0.9408226338317548, 0.9639719272779138, 0.9815078774502503, 0.9931285991850949, 0.9988590315882777]
-          w = [0.0030735837185205317, 0.008600269855642943, 0.014626169256971253, 0.020388373461266523, 0.02588213360495116, 0.0312873067770328, 0.036600169758200796, 0.041668873327973685, 0.04643482186749767, 0.05094457392372869, 0.05519510534828599, 0.05911140088063957, 0.06265323755478117, 0.06583459713361842, 0.06864867292852161, 0.07105442355344407, 0.07303069033278667, 0.07458287540049918, 0.07570449768455667, 0.07637786767208074, 0.07660071191799965, 0.07637786767208074, 0.07570449768455667, 0.07458287540049918, 0.07303069033278667, 0.07105442355344407, 0.06864867292852161, 0.06583459713361842, 0.06265323755478117, 0.05911140088063957, 0.05519510534828599, 0.05094457392372869, 0.04643482186749767, 0.041668873327973685, 0.036600169758200796, 0.0312873067770328, 0.02588213360495116, 0.020388373461266523, 0.014626169256971253, 0.008600269855642943, 0.0030735837185205317]
+
+          z = [-0.9988590315882777, -0.9931285991850949, -0.9815078774502503,
+               -0.9639719272779138, -0.9408226338317548, -0.912234428251326,
+               -0.878276811252282, -0.8391169718222188, -0.7950414288375512,
+               -0.7463319064601508, -0.6932376563347514, -0.636053680726515,
+               -0.5751404468197103, -0.5108670019508271, -0.4435931752387251,
+               -0.37370608871541955, -0.301627868114913, -0.22778585114164507,
+               -0.15260546524092267, -0.07652652113349734, 0.0,
+               0.07652652113349734, 0.15260546524092267, 0.22778585114164507,
+               0.301627868114913, 0.37370608871541955, 0.4435931752387251,
+               0.5108670019508271, 0.5751404468197103, 0.636053680726515,
+               0.6932376563347514, 0.7463319064601508, 0.7950414288375512,
+               0.8391169718222188, 0.878276811252282, 0.912234428251326,
+               0.9408226338317548, 0.9639719272779138, 0.9815078774502503,
+               0.9931285991850949, 0.9988590315882777]
+
+          w = [0.0030735837185205317, 0.008600269855642943,
+               0.014626169256971253, 0.020388373461266523, 0.02588213360495116,
+               0.0312873067770328, 0.036600169758200796, 0.041668873327973685,
+               0.04643482186749767, 0.05094457392372869, 0.05519510534828599,
+               0.05911140088063957, 0.06265323755478117, 0.06583459713361842,
+               0.06864867292852161, 0.07105442355344407, 0.07303069033278667,
+               0.07458287540049918, 0.07570449768455667, 0.07637786767208074,
+               0.07660071191799965, 0.07637786767208074, 0.07570449768455667,
+               0.07458287540049918, 0.07303069033278667, 0.07105442355344407,
+               0.06864867292852161, 0.06583459713361842, 0.06265323755478117,
+               0.05911140088063957, 0.05519510534828599, 0.05094457392372869,
+               0.04643482186749767, 0.041668873327973685, 0.036600169758200796,
+               0.0312873067770328, 0.02588213360495116, 0.020388373461266523,
+               0.014626169256971253, 0.008600269855642943,
+               0.0030735837185205317]
+
         when 61
           #g30k61
-          z = [-0.9994844100504906, -0.9968934840746495, -0.9916309968704046, -0.9836681232797472, -0.9731163225011262, -0.9600218649683075, -0.94437444474856, -0.9262000474292743, -0.9055733076999078, -0.8825605357920527, -0.8572052335460612, -0.8295657623827684, -0.799727835821839, -0.7677774321048262, -0.7337900624532268, -0.6978504947933158, -0.6600610641266269, -0.6205261829892429, -0.5793452358263617, -0.5366241481420199, -0.49248046786177857, -0.44703376953808915, -0.4004012548303944, -0.3527047255308781, -0.30407320227362505, -0.25463692616788985, -0.20452511668230988, -0.15386991360858354, -0.10280693796673702, -0.0514718425553177, 0.0, 0.0514718425553177, 0.10280693796673702, 0.15386991360858354, 0.20452511668230988, 0.25463692616788985, 0.30407320227362505, 0.3527047255308781, 0.4004012548303944, 0.44703376953808915, 0.49248046786177857, 0.5366241481420199, 0.5793452358263617, 0.6205261829892429, 0.6600610641266269, 0.6978504947933158, 0.7337900624532268, 0.7677774321048262, 0.799727835821839, 0.8295657623827684, 0.8572052335460612, 0.8825605357920527, 0.9055733076999078, 0.9262000474292743, 0.94437444474856, 0.9600218649683075, 0.9731163225011262, 0.9836681232797472, 0.9916309968704046, 0.9968934840746495, 0.9994844100504906]
-          w = [0.0013890136986770077, 0.003890461127099884, 0.0066307039159312926, 0.009273279659517764, 0.011823015253496341, 0.014369729507045804, 0.01692088918905327, 0.019414141193942382, 0.021828035821609193, 0.0241911620780806, 0.0265099548823331, 0.02875404876504129, 0.030907257562387762, 0.03298144705748372, 0.034979338028060025, 0.03688236465182123, 0.038678945624727595, 0.040374538951535956, 0.041969810215164244, 0.04345253970135607, 0.04481480013316266, 0.04605923827100699, 0.04718554656929915, 0.04818586175708713, 0.04905543455502978, 0.04979568342707421, 0.05040592140278235, 0.05088179589874961, 0.051221547849258774, 0.05142612853745902, 0.05149472942945157, 0.05142612853745902, 0.051221547849258774, 0.05088179589874961, 0.05040592140278235, 0.04979568342707421, 0.04905543455502978, 0.04818586175708713, 0.04718554656929915, 0.04605923827100699, 0.04481480013316266, 0.04345253970135607, 0.041969810215164244, 0.040374538951535956, 0.038678945624727595, 0.03688236465182123, 0.034979338028060025, 0.03298144705748372, 0.030907257562387762, 0.02875404876504129, 0.0265099548823331, 0.0241911620780806, 0.021828035821609193, 0.019414141193942382, 0.01692088918905327, 0.014369729507045804, 0.011823015253496341, 0.009273279659517764, 0.0066307039159312926, 0.003890461127099884, 0.0013890136986770077]
+
+          z = [-0.9994844100504906, -0.9968934840746495, -0.9916309968704046,
+               -0.9836681232797472, -0.9731163225011262, -0.9600218649683075,
+               -0.94437444474856, -0.9262000474292743, -0.9055733076999078,
+               -0.8825605357920527, -0.8572052335460612, -0.8295657623827684,
+               -0.799727835821839, -0.7677774321048262, -0.7337900624532268,
+               -0.6978504947933158, -0.6600610641266269, -0.6205261829892429,
+               -0.5793452358263617, -0.5366241481420199, -0.49248046786177857,
+               -0.44703376953808915, -0.4004012548303944, -0.3527047255308781,
+               -0.30407320227362505, -0.25463692616788985,
+               -0.20452511668230988, -0.15386991360858354,
+               -0.10280693796673702, -0.0514718425553177, 0.0,
+               0.0514718425553177, 0.10280693796673702, 0.15386991360858354,
+               0.20452511668230988, 0.25463692616788985, 0.30407320227362505,
+               0.3527047255308781, 0.4004012548303944, 0.44703376953808915,
+               0.49248046786177857, 0.5366241481420199, 0.5793452358263617,
+               0.6205261829892429, 0.6600610641266269, 0.6978504947933158,
+               0.7337900624532268, 0.7677774321048262, 0.799727835821839,
+               0.8295657623827684, 0.8572052335460612, 0.8825605357920527,
+               0.9055733076999078, 0.9262000474292743, 0.94437444474856,
+               0.9600218649683075, 0.9731163225011262, 0.9836681232797472,
+               0.9916309968704046, 0.9968934840746495, 0.9994844100504906]
+
+          w = [0.0013890136986770077, 0.003890461127099884,
+               0.0066307039159312926, 0.009273279659517764,
+               0.011823015253496341, 0.014369729507045804, 0.01692088918905327,
+               0.019414141193942382, 0.021828035821609193, 0.0241911620780806,
+               0.0265099548823331, 0.02875404876504129, 0.030907257562387762,
+               0.03298144705748372, 0.034979338028060025, 0.03688236465182123,
+               0.038678945624727595, 0.040374538951535956,
+               0.041969810215164244, 0.04345253970135607, 0.04481480013316266,
+               0.04605923827100699, 0.04718554656929915, 0.04818586175708713,
+               0.04905543455502978, 0.04979568342707421, 0.05040592140278235,
+               0.05088179589874961, 0.051221547849258774, 0.05142612853745902,
+               0.05149472942945157, 0.05142612853745902, 0.051221547849258774,
+               0.05088179589874961, 0.05040592140278235, 0.04979568342707421,
+               0.04905543455502978, 0.04818586175708713, 0.04718554656929915,
+               0.04605923827100699, 0.04481480013316266, 0.04345253970135607,
+               0.041969810215164244, 0.040374538951535956,
+               0.038678945624727595, 0.03688236465182123, 0.034979338028060025,
+               0.03298144705748372, 0.030907257562387762, 0.02875404876504129,
+               0.0265099548823331, 0.0241911620780806, 0.021828035821609193,
+               0.019414141193942382, 0.01692088918905327, 0.014369729507045804,
+               0.011823015253496341, 0.009273279659517764,
+               0.0066307039159312926, 0.003890461127099884,
+               0.0013890136986770077]
+
         else # using 15 point quadrature
+
           n = 15
-          z = [-0.9914553711208126, -0.9491079123427585, -0.8648644233597691, -0.7415311855993945, -0.5860872354676911, -0.4058451513773972, -0.20778495500789848, 0.0, 0.20778495500789848, 0.4058451513773972, 0.5860872354676911, 0.7415311855993945, 0.8648644233597691, 0.9491079123427585, 0.9914553711208126]
-          w = [0.022935322010529224, 0.06309209262997856, 0.10479001032225019, 0.14065325971552592, 0.1690047266392679, 0.19035057806478542, 0.20443294007529889, 0.20948214108472782, 0.20443294007529889, 0.19035057806478542, 0.1690047266392679, 0.14065325971552592, 0.10479001032225019, 0.06309209262997856, 0.022935322010529224]
+
+          z = [-0.9914553711208126, -0.9491079123427585, -0.8648644233597691,
+               -0.7415311855993945, -0.5860872354676911, -0.4058451513773972,
+               -0.20778495500789848, 0.0, 0.20778495500789848,
+               0.4058451513773972, 0.5860872354676911, 0.7415311855993945,
+               0.8648644233597691, 0.9491079123427585, 0.9914553711208126]
+
+          w = [0.022935322010529224, 0.06309209262997856, 0.10479001032225019,
+               0.14065325971552592, 0.1690047266392679, 0.19035057806478542,
+               0.20443294007529889, 0.20948214108472782, 0.20443294007529889,
+               0.19035057806478542, 0.1690047266392679, 0.14065325971552592,
+               0.10479001032225019, 0.06309209262997856, 0.022935322010529224]
+
       end
+
       sum = 0
       (0...n).each do |i|
         t = ((t1.to_f + t2) / 2.0) + (((t2 - t1) / 2.0) * z[i])
         sum += w[i] * yield(t)
       end
-      return ((t2 - t1) / 2.0) * sum
+
+      ((t2 - t1) / 2.0) * sum
     end
-    # TODO: Document method
+
+    # Romberg Method:
+    # It is obtained by applying extrapolation techniques repeatedly on the trapezoidal rule
     def romberg(a, b, tolerance,max_iter=20)
       # NOTE one-based arrays are used for convenience
       h = b.to_f - a
@@ -251,8 +418,10 @@ class Integration
       end
       r[j][j]
     end
-    
-    # TODO: Document method
+
+    # Monte Carlo:
+    # Uses a non deterministic(probabilistic) approach for calculation of definite integrals
+    # Estimates the integral by randomly choosing points in a set and then calculating the number of points that fall in the desired area
     def monte_carlo(t1, t2, n)
       width = (t2 - t1).to_f
       height = nil
@@ -269,15 +438,19 @@ class Integration
       end
       return (width * height) * area_ratio
     end
+
     def is_infinite?(v)
-      v==Infinity or v==MInfinity
+      v == Infinity || v == MInfinity
     end
+
     # Methods available on pure ruby
     RUBY_METHOD=[:rectangle,:trapezoid,:simpson, :adaptive_quadrature , :gauss, :romberg, :monte_carlo, :gauss_kronrod, :simpson3by8, :boole, :open_trapezoid, :milne]
+
     # Methods available with Ruby/GSL library
     GSL_METHOD=[:qng, :qag]
+
     # Get the integral for a function +f+, with bounds +t1+ and
-    # +t2+ given a hash of +options+. 
+    # +t2+ given a hash of +options+.
     # If Ruby/GSL is available, you could use +Integration::Minfinity+
     # and +Integration::Infinity+ as bounds. Method
     # Options are
@@ -285,7 +458,7 @@ class Integration
     #                 Default: 1e-10
     # [:initial_step] Initial number of subdivitions
     # [:step]         Subdivitions increment on each iteration
-    # [:method]       Integration method. 
+    # [:method]       Integration method.
     # Methods are
     # [:rectangle] for [:initial_step+:step*iteration] quadrilateral subdivisions
     # [:trapezoid] for [:initial_step+:step*iteration] trapezoid-al subdivisions
@@ -304,7 +477,7 @@ class Integration
         lower_bound=t1
         upper_bound=t2
         options[:method]=:qag if options[:method].nil?
-      else 
+      else
         lower_bound = [t1, t2].min
         upper_bound = [t1, t2].max
       end
@@ -320,35 +493,37 @@ class Integration
         raise "Unknown integration method \"#{options[:method]}\""
       end
     end
+
     # TODO: Document method
-    def integrate_gsl(lower_bound,upper_bound,options,&f) 
-      
+    def integrate_gsl(lower_bound,upper_bound,options,&f)
+
       f = GSL::Function.alloc(&f)
       method=options[:method]
       tolerance=options[:tolerance]
-     
+
       if(method==:qag)
         w = GSL::Integration::Workspace.alloc()
-        if(is_infinite?(lower_bound) and  is_infinite?(upper_bound))        
+        if(is_infinite?(lower_bound) and  is_infinite?(upper_bound))
           #puts "ambos"
-          val=f.qagi([tolerance,0.0], 1000, w)  
+          val=f.qagi([tolerance,0.0], 1000, w)
         elsif is_infinite?(lower_bound)
           #puts "inferior #{upper_bound}"
-          val=f.qagil(upper_bound, [tolerance, 0], w) 
+          val=f.qagil(upper_bound, [tolerance, 0], w)
         elsif is_infinite?(upper_bound)
           #puts "superior"
           val=f.qagiu(lower_bound, [tolerance, 0], w)
         else
-          
+
           val=f.qag([lower_bound,upper_bound],[tolerance,0.0], GSL::Integration::GAUSS61, w)
         end
       elsif(method==:qng)
-        val=f.qng([lower_bound, upper_bound], [tolerance, 0.0]) 
+        val=f.qng([lower_bound, upper_bound], [tolerance, 0.0])
       else
         raise "Unknown integration method \"#{method}\""
       end
       val[0]
     end
+
     def integrate_ruby(lower_bound,upper_bound,options,&f)
       method=options[:method]
       tolerance=options[:tolerance]
@@ -388,14 +563,14 @@ class Integration
           current_step+=step
           previous=value
           #puts "Llamando al metodo"
-          
+
           value=method_obj.call(lower_bound, upper_bound, current_step, &f)
         end
-        #p diffs
-        
+
         value
       end
     end
   end
+
   create_has_library :gsl
 end