QuadGK added

madsjulia · Mar 17, 2017 · 2a69b18 · 2a69b18
1 parent 2a43c29
commit 2a69b18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/REQUIRE b/REQUIRE
@@ -1,4 +1,5 @@
 julia 0.5
+QuadGK
 Distributions
 MetaProgTools
 JLD

diff --git a/src/Anasol.jl b/src/Anasol.jl
@@ -1,5 +1,6 @@
 __precompile__()
 
+import QuadGK
 import Compat
 import Compat.string
 

diff --git a/src/newanasol.jl b/src/newanasol.jl
@@ -1,3 +1,5 @@
+import QuadGK
+
 include("gencode.jl")
 
 function kernel(x::Vector, tau::Real, x0::Vector, sigma0::Vector, v::Vector, sigma::Vector, H::Vector, xb::Vector, dispersions, sources, boundaries, distributions=nothing)
@@ -13,7 +15,7 @@ function cinnerkernel(dimtype, x, tau, x0, sigma0, v, sigma, H, xb, lambda, t0,
 end
 
 function quadgkwithtol(f, a, b)
-	return quadgk(f, a, b; reltol=1.0e-7, abstol=1e-4)[1]
+	return QuadGK.quadgk(f, a, b; reltol=1.0e-7, abstol=1e-4)[1]
 end
 
 function kernel_c(x::Vector, t::Real, x0::Vector, sigma0::Vector, v::Vector, sigma::Vector, H::Vector, xb::Vector, lambda::Real, t0::Real, t1::Real, dispersions, sources, boundaries, distributions=nothing)