Skip to content

Refactor integral estimation and error handling #2

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

Merged
alexandrehoffmann merged 3 commits into from
Jul 24, 2026
Merged

Refactor integral estimation and error handling #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5df074b
Refactor integral estimation and error handling
alexandrehoffmann Jul 24, 2026
e4bf178
Restore isnan guard in remapAndIntegrate to handle NaN/Inf at endpoints
Copilot Jul 24, 2026
20bbfdd
Fix integration limits in AdaptiveQuadratureBase_impl.hpp
alexandrehoffmann Jul 24, 2026
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
7 changes: 5 additions & 2 deletions include/LNIT/AdaptiveQuadratures/AdaptiveQuadratureBase_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ auto AdaptiveQuadratureBase<Derived>::adaptQuadrature(const Function& f) -> Long

using const_Iterator = typename std::vector<LongScalar>::const_iterator;

LongScalar res;
LongScalar estimatedErr;

m_hasConverged = false;

if (m_out) { fmt::print(m_out, "#Iteration integral estimated_error relative_tol absolute_tol\n"); }
Expand All @@ -60,7 +63,7 @@ auto AdaptiveQuadratureBase<Derived>::adaptQuadrature(const Function& f) -> Long
m_intervals[maxErrIdx] = Interval(a, midPoint);
std::tie(m_subIntergrals[maxErrIdx], m_subIntergralsErr[maxErrIdx]) = estimateIntegral(f, a, midPoint);
// second interval
const auto [res, estimatedErr] = estimateIntegral(f, midPoint, b);
std::tie(res, estimatedErr) = estimateIntegral(f, midPoint, b);
m_intervals.emplace_back(std::move(midPoint), b);
m_subIntergrals.push_back(res);
m_subIntergralsErr.push_back(estimatedErr);
Expand Down Expand Up @@ -254,7 +257,7 @@ auto AdaptiveQuadratureBase<Derived>::remapAndIntegrate(const Function& f) -> Lo
: fx*dxdt;
};

return integrate(fref, -1 + eps, 1 - eps);
return integrate(fref, -1, 1);
}

template<class Derived> template<class Function>
Expand Down
Loading