Skip to content

Adjust recursion when using the Bessel function approximation with la… #1036

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
merged 2 commits into from
Oct 13, 2023
Merged

Adjust recursion when using the Bessel function approximation with la… #1036

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
2dbd769
Adjust recursion when using the Bessel function approximation with la…
jzmaddock Oct 11, 2023
57b09f4
More test cases and corrections.
jzmaddock Oct 12, 2023
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
8 changes: 8 additions & 0 deletions include/boost/math/special_functions/detail/hypergeometric_1F1_large_abz.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,15 @@
// So shift b to match a (b shifting seems to be more stable via method of ratios).
//
int b_shift = itrunc(b - a);
if ((b_shift < 0) && (b - b_shift != a))
b_shift -= 1;
T b_local = b - b_shift;
if ((b_local - a - 0.5 <= 0) && (b_local != a))
{
// Make sure b_local - a - 0.5 > 0
b_shift -= 1;
b_local += 1;
}
T h = boost::math::detail::hypergeometric_1F1_AS_13_3_6(a, b_local, z, T(b_local - a), pol, log_scaling);
return hypergeometric_1F1_shift_on_b(h, a, b_local, z, b_shift, pol, log_scaling);
}
Expand Down
4 changes: 3 additions & 1 deletion include/boost/math/special_functions/hypergeometric_1F1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,9 @@ namespace boost { namespace math { namespace detail {
if ((a < 0) && (a == ceil(a)) && (a > -50))
return detail::hypergeometric_1F1_generic_series(a, b, z, pol, log_scaling, function);

return (b + z) * exp(z) / b;
log_scaling = lltrunc(floor(z));
T local_z = z - log_scaling;
return (b + z) * exp(local_z) / b;
}

if ((a == 1) && (b == 2))
Expand Down
7 changes: 6 additions & 1 deletion test/test_1F1.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void test_spots5(T, const char* type_name)
template <class T>
void test_spots6(T, const char* type_name)
{
static const std::array<std::array<T, 4>, 183> hypergeometric_1F1_bugs = { {
static const std::array<std::array<T, 4>, 186> hypergeometric_1F1_bugs = { {
{ { static_cast<double>(17955.561660766602), static_cast<double>(9.6968994205831605e-09), static_cast<double>(-82.406154185533524), SC_(6.98056008378736714088730927132364938220428678e-11) }},
{ { static_cast<double>(17955.561660766602), static_cast<double>(-9.6968994205831605e-09), static_cast<double>(-82.406154185533524), SC_(-6.98055306629610746072607353939306734740549551e-11) }},
{ { static_cast<double>(-17955.561660766602), static_cast<double>(-9.6968994205831605e-09), static_cast<double>(82.406154185533524), SC_(-42897094853118832762870100.8669248353530950866) }} ,
Expand Down Expand Up @@ -390,6 +390,11 @@ void test_spots6(T, const char* type_name)
{ { -28, 28, 28, SC_(-6.2125286411657869483728921158018766e-9) } },
{ { -29, 29, 29, SC_(-1.3521578972057573423569167878458172e-9) } },
{{ -30, 30, 30, SC_(8.2238878884841599031462003461115991e-10) } },

// https://github.com/boostorg/math/issues/1034
{{ 13, 1.5f, 61, SC_(1.35508577094765660270265300640877455638098585524020525369044e39)}},
{{ 13, 1.5f - T(1)/128, 61, SC_(1.40067238333701986992154961431485209677766220602448290643906e39)}},
{{ 13, 1.5f + T(1)/128, 61, SC_(1.31105748771677778012064837998217769289913724450105998963999e39)}},
} };
static const std::array<std::array<T, 4>, 2> hypergeometric_1F1_big_bugs = { {
#if DBL_MAX_EXP == LDBL_MAX_EXP
Expand Down
5 changes: 0 additions & 5 deletions test/test_1F1_log.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,6 @@ BOOST_AUTO_TEST_CASE( test_main )
expected_results();
BOOST_MATH_CONTROL_FP;

#if !defined(TEST) || (TEST == 1)
test_hypergeometric_mellin_transform<double>();
test_hypergeometric_laplace_transform<double>();
#endif

#ifndef BOOST_MATH_BUGGY_LARGE_FLOAT_CONSTANTS
#if !defined(TEST) || (TEST == 2)
test_spots(0.0F, "float");
Expand Down
18 changes: 18 additions & 0 deletions test/test_1F1_log.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,28 @@ void test_spots2(T, const char* type_name)
do_test_1F1<T>(hypergeometric_1f1_log_large_unsolved, type_name, "Large random values - log - unsolved");
}

template <class T>
void test_spots_bugs(T, const char* type_name)
{
static const std::array<std::array<T, 4>, 7> hypergeometric_1F1_bugs = { {
// Found while investigating https://github.com/boostorg/math/issues/1034
{{ 21156.0f, 21156.0f, 11322, SC_(11322.0)}},
{{ 21156.0f, 21155.0f, 11322, SC_(11322.428655862323560632951631114666466652986288119296800531328684)}},
{{ 21156.0f, 21154.0f, 11322, SC_(11322.857338938931770780542471014439235046236959098048505808665509)}},
{{ 21156.0f, 21154.5f, 11322, SC_(11322.642993998700652342915766513423502332460377941025163971463001)}},
{{ 21156.0f, 21155.0f - 1.0f / 128, 11322, SC_(11322.43200484338133063401686149227756707)}},
{{ 21156.0f, 21154.5f - 1.0f / 128, 11322, SC_(11322.646343086066466097278446364687150256282052775170519455915995)}},
{{ 21156.0f, 21154.0f + 1.0f / 128, 11322, SC_(11322.85398974691465958225700429672975704)}},
} };

do_test_1F1<T>(hypergeometric_1F1_bugs, type_name, "Large random values - log - bug cases");
}

template <class T>
void test_spots(T z, const char* type_name)
{
test_spots1(z, type_name);
test_spots_bugs(z, type_name);
#ifdef TEST_UNSOLVED
test_spots2(z, type_name);
#endif
Expand Down