Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pass the algorithm to the solution #235

Merged
merged 2 commits into from
Feb 16, 2024
Merged

pass the algorithm to the solution #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c86d196
pass the algotihm to the solution
lxvm Feb 16, 2024
ec85909
add test
lxvm Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/IntegralsMCIntegrationExt.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function Integrals.__solvebp_call(prob::IntegralProblem, alg::VEGASMC, sensealg,
else
map(a -> reshape(a, size(f0)), (res.mean, res.stdev, res.chi2))
end
SciMLBase.build_solution(prob, VEGASMC(), out, err, chi=chi, retcode = ReturnCode.Success)
SciMLBase.build_solution(prob, alg, out, err, chi=chi, retcode = ReturnCode.Success)
end
end

Expand Down
10 changes: 5 additions & 5 deletions src/Integrals.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
end
val, err = quadgk(f, lb, ub, segbuf = cache.cacheval, maxevals = maxiters,
rtol = reltol, atol = abstol, order = alg.order, norm = alg.norm)
SciMLBase.build_solution(prob, QuadGKJL(), val, err, retcode = ReturnCode.Success)
SciMLBase.build_solution(prob, alg, val, err, retcode = ReturnCode.Success)

Check warning on line 115 in src/Integrals.jl

View check run for this annotation

Codecov / codecov/patch

src/Integrals.jl#L115 

Added line #L115 was not covered by tests
else
u = prob.f(typeof(mid)[], p)
f = if u isa AbstractVector
Expand All @@ -125,20 +125,20 @@
end
val, err = quadgk(f, lb, ub, segbuf = cache.cacheval, maxevals = maxiters,
rtol = reltol, atol = abstol, order = alg.order, norm = alg.norm)
SciMLBase.build_solution(prob, QuadGKJL(), val, err, retcode = ReturnCode.Success)
SciMLBase.build_solution(prob, alg, val, err, retcode = ReturnCode.Success)

Check warning on line 128 in src/Integrals.jl

View check run for this annotation

Codecov / codecov/patch

src/Integrals.jl#L128 

Added line #L128 was not covered by tests
end
else
if isinplace(prob)
result = prob.f.integrand_prototype * mid # result may have different units than prototype
f = (y, x) -> prob.f(y, x, p)
val, err = quadgk!(f, result, lb, ub, segbuf = cache.cacheval, maxevals = maxiters,
rtol = reltol, atol = abstol, order = alg.order, norm = alg.norm)
SciMLBase.build_solution(prob, QuadGKJL(), val, err, retcode = ReturnCode.Success)
SciMLBase.build_solution(prob, alg, val, err, retcode = ReturnCode.Success)

Check warning on line 136 in src/Integrals.jl

View check run for this annotation

Codecov / codecov/patch

src/Integrals.jl#L136 

Added line #L136 was not covered by tests
else
f = x -> prob.f(x, p)
val, err = quadgk(f, lb, ub, segbuf = cache.cacheval, maxevals = maxiters,
rtol = reltol, atol = abstol, order = alg.order, norm = alg.norm)
SciMLBase.build_solution(prob, QuadGKJL(), val, err, retcode = ReturnCode.Success)
SciMLBase.build_solution(prob, alg, val, err, retcode = ReturnCode.Success)
end
end
end
Expand Down Expand Up @@ -166,7 +166,7 @@
rtol = reltol, atol = abstol,
maxevals = maxiters, norm = alg.norm, initdiv = alg.initdiv)
end
SciMLBase.build_solution(prob, HCubatureJL(), val, err, retcode = ReturnCode.Success)
SciMLBase.build_solution(prob, alg, val, err, retcode = ReturnCode.Success)
end

function __solvebp_call(prob::IntegralProblem, alg::VEGAS, sensealg, domain, p;
Expand Down
12 changes: 12 additions & 0 deletions test/interface_tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ end
prob = IntegralProblem(integrands[i], lb, ub)
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
@test sol.u≈exact_sol[i](dim, nout, lb, ub) rtol=1e-2
end
end
Expand All @@ -119,6 +120,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
@test sol.u≈exact_sol[i](dim, nout, lb, ub) rtol=1e-2
end
end
Expand All @@ -137,6 +139,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
if sol.u isa Number
@test sol.u≈exact_sol[i](dim, nout, lb, ub) rtol=1e-2
else
Expand All @@ -158,6 +161,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
@test sol.u[1]≈exact_sol[i](dim, nout, lb, ub) rtol=1e-2
end
end
Expand All @@ -175,6 +179,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
if sol.u isa Number
@test sol.u≈exact_sol[i](dim, nout, lb, ub) rtol=1e-2
else
Expand All @@ -198,6 +203,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
if sol.u isa Number
@test sol.u≈exact_sol[i](dim, nout, lb, ub) rtol=1e-2
else
Expand All @@ -222,6 +228,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
if nout == 1
@test sol.u[1]≈exact_sol_v[i](dim, nout, lb, ub)[1] rtol=1e-2
else
Expand All @@ -245,6 +252,7 @@ end
nout = nout)
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
if nout == 1
@test sol.u[1]≈exact_sol_v[i](dim, nout, lb, ub)[1] rtol=1e-2
else
Expand All @@ -270,6 +278,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
if nout == 1
@test sol.u[1]≈exact_sol_v[i](dim, nout, lb, ub)[1] rtol=1e-2
else
Expand All @@ -293,6 +302,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
@test sol.u≈exact_sol_v[i](dim, nout, lb, ub) rtol=1e-2
end
end
Expand All @@ -313,6 +323,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
@test sol.u≈exact_sol_v[i](dim, nout, lb, ub) rtol=1e-2
end
end
Expand All @@ -333,6 +344,7 @@ end
end
@info "Alg = $(nameof(typeof(alg))), Integrand = $i, Dimension = $dim, Output Dimension = $nout"
sol = solve(prob, alg, reltol = reltol, abstol = abstol)
@test sol.alg == alg
@test sol.u≈exact_sol_v[i](dim, nout, lb, ub) rtol=1e-2
end
end
Expand Down
Loading