Bug fix in ndim integration and added project file (#19)

* update and bug fix

* added Project.toml

* functional barrier improvement

Author: m-wells

.gitignore

@@ -1,3 +1,4 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+Manifest.toml

Project.toml

@@ -0,0 +1,20 @@
+name = "NumericalIntegration"
+uuid = "5f557876-c23b-11e9-3c4d-2f49abec428a"
+authors = ["dextorious"]
+version = "0.2.1"
+
+[deps]
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
+
+[compat]
+julia = "0.7, 1"
+
+[extras]
+HCubature = "19dc6840-f33b-545b-b366-655c7e3ffd49"
+InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test", "InteractiveUtils", "StaticArrays", "HCubature"]

src/NumericalIntegration.jl

@@ -176,27 +176,24 @@ function integrate(x::AbstractVector, y::AbstractVector, m::RombergEven)
     @inbounds return rombaux[maxsteps, prevrow]
 end
 
+
+
+function integrate(X::Tuple{AbstractVector}, Y::AbstractVector{T}, M::IntegrationMethod) :: T where {T}
+    return integrate(X[1], Y, M)
+end
 """
     integrate(X::NTuple{N,AbstractVector}, Y::AbstractArray{T,N}, method, cache=nothing)
 
 Given an n-dimensional grid of values, compute the total integral along each dim
 """
-function integrate(X::NTuple{N,AbstractVector}, Y::AbstractArray{T,N}, M::IntegrationMethod,
-                   cache::Union{AbstractVector{T}, Nothing}=nothing) :: T where {T,N}
-    dims = size(Y)
-    n = dims[end]
-    if N == 1
-        return integrate(X[1], Y, M)
-    else
-        if cache == nothing
-            cache = Vector{T}(undef, n)
-        end
-        x = X[1:N-1]
-        @inbounds for i in 1:n
-            cache[i] = integrate(x, selectdim(Y,N,i), M)
-        end
-        return integrate(X[end], cache, M)
+function integrate(X::NTuple{N,AbstractVector}, Y::AbstractArray{T,N}, M::IntegrationMethod) :: T where {T,N}
+    n = last(size(Y))
+    cache = Vector{T}(undef, n)
+    x = X[1:N-1]
+    @inbounds for i in 1:n
+        cache[i] = integrate(x, selectdim(Y,N,i), M)
     end
+    return integrate(X[end], cache, M)
 end