Skip to content

Commit c61c4af

Browse files
jzmaddockjzmaddock
committed
Merge branch 'develop' into issue1120
2 parents fc2ebf5 + a243640 commit c61c4af

13 files changed

+97
-56
lines changed

‎include/boost/math/distributions/geometric.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,8 @@ namespace boost
384384
inline RealType logcdf(const geometric_distribution<RealType, Policy>& dist, const RealType& k)
385385
{ // Cumulative Distribution Function of geometric.
386386
using std::pow;
387+
using std::log;
388+
using std::exp;
387389
static const char* function = "boost::math::logcdf(const geometric_distribution<%1%>&, %1%)";
388390

389391
// k argument may be integral, signed, or unsigned, or floating point.

‎include/boost/math/special_functions/ellint_1.hpp

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,12 @@ template <typename T, typename Policy>
4141
T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 1> const&);
4242
template <typename T, typename Policy>
4343
T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&);
44+
template <typename T, typename Policy>
45+
T ellint_k_imp(T k, const Policy& pol, T one_minus_k2);
4446

4547
// Elliptic integral (Legendre form) of the first kind
4648
template <typename T, typename Policy>
47-
T ellint_f_imp(T phi, T k, const Policy& pol)
49+
T ellint_f_imp(T phi, T k, const Policy& pol, T one_minus_k2)
4850
{
4951
BOOST_MATH_STD_USING
5052
using namespace boost::math::tools;
@@ -75,12 +77,7 @@ T ellint_f_imp(T phi, T k, const Policy& pol)
7577
{
7678
// Phi is so large that phi%pi is necessarily zero (or garbage),
7779
// just return the second part of the duplication formula:
78-
typedef std::integral_constant<int,
79-
std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
80-
std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
81-
> precision_tag_type;
82-
83-
result = 2 * phi * ellint_k_imp(k, pol, precision_tag_type()) / constants::pi<T>();
80+
result = 2 * phi * ellint_k_imp(k, pol, one_minus_k2) / constants::pi<T>();
8481
BOOST_MATH_INSTRUMENT_VARIABLE(result);
8582
}
8683
else
@@ -121,31 +118,40 @@ T ellint_f_imp(T phi, T k, const Policy& pol)
121118
BOOST_MATH_ASSERT(rphi != 0); // precondition, can't be true if sin(rphi) != 0.
122119
//
123120
// Use http://dlmf.nist.gov/19.25#E5, note that
124-
// c-1 simplifies to cot^2(rphi) which avoid cancellation:
121+
// c-1 simplifies to cot^2(rphi) which avoids cancellation.
122+
// Likewise c - k^2 is the same as (c - 1) + (1 - k^2).
125123
//
126124
T c = 1 / sinp;
127-
result = static_cast<T>(s * ellint_rf_imp(T(cosp / sinp), T(c - k * k), c, pol));
125+
T c_minus_one = cosp / sinp;
126+
T cross = fabs(c / (k * k));
127+
T arg2;
128+
if ((cross > 0.9f) && (cross < 1.1f))
129+
arg2 = c_minus_one + one_minus_k2;
130+
else
131+
arg2 = c - k * k;
132+
result = static_cast<T>(s * ellint_rf_imp(c_minus_one, arg2, c, pol));
128133
}
129134
else
130135
result = s * sin(rphi);
131136
BOOST_MATH_INSTRUMENT_VARIABLE(result);
132137
if(m != 0)
133138
{
134-
typedef std::integral_constant<int,
135-
std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
136-
std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
137-
> precision_tag_type;
138-
139-
result += m * ellint_k_imp(k, pol, precision_tag_type());
139+
result += m * ellint_k_imp(k, pol, one_minus_k2);
140140
BOOST_MATH_INSTRUMENT_VARIABLE(result);
141141
}
142142
}
143143
return invert ? T(-result) : result;
144144
}
145145

146+
template <typename T, typename Policy>
147+
inline T ellint_f_imp(T phi, T k, const Policy& pol)
148+
{
149+
return ellint_f_imp(phi, k, pol, T(1 - k * k));
150+
}
151+
146152
// Complete elliptic integral (Legendre form) of the first kind
147153
template <typename T, typename Policy>
148-
T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
154+
T ellint_k_imp(T k, const Policy& pol, T one_minus_k2)
149155
{
150156
BOOST_MATH_STD_USING
151157
using namespace boost::math::tools;
@@ -162,12 +168,16 @@ T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
162168
}
163169

164170
T x = 0;
165-
T y = 1 - k * k;
166171
T z = 1;
167-
T value = ellint_rf_imp(x, y, z, pol);
172+
T value = ellint_rf_imp(x, one_minus_k2, z, pol);
168173

169174
return value;
170175
}
176+
template <typename T, typename Policy>
177+
inline T ellint_k_imp(T k, const Policy& pol, std::integral_constant<int, 2> const&)
178+
{
179+
return ellint_k_imp(k, pol, T(1 - k * k));
180+
}
171181

172182
//
173183
// Special versions for double and 80-bit long double precision,

‎include/boost/math/special_functions/heuman_lambda.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ T heuman_lambda_imp(T phi, T k, const Policy& pol)
6363
return policies::raise_domain_error<T>(function, "When 1-k^2 == 1 then phi must be < Pi/2, but got phi = %1%", phi, pol);
6464
}
6565
else
66-
ratio = ellint_f_imp(phi, rkp, pol) / ellint_k_imp(rkp, pol, precision_tag_type());
67-
result = ratio + ellint_k_imp(k, pol, precision_tag_type()) * jacobi_zeta_imp(phi, rkp, pol) / constants::half_pi<T>();
66+
ratio = ellint_f_imp(phi, rkp, pol, k2) / ellint_k_imp(rkp, pol, k2);
67+
result = ratio + ellint_k_imp(k, pol, precision_tag_type()) * jacobi_zeta_imp(phi, rkp, pol, k2) / constants::half_pi<T>();
6868
}
6969
return result;
7070
}

‎include/boost/math/special_functions/jacobi_zeta.hpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace detail{
2727

2828
// Elliptic integral - Jacobi Zeta
2929
template <typename T, typename Policy>
30-
T jacobi_zeta_imp(T phi, T k, const Policy& pol)
30+
T jacobi_zeta_imp(T phi, T k, const Policy& pol, T kp)
3131
{
3232
BOOST_MATH_STD_USING
3333
using namespace boost::math::tools;
@@ -44,21 +44,22 @@ T jacobi_zeta_imp(T phi, T k, const Policy& pol)
4444
T sinp = sin(phi);
4545
T cosp = cos(phi);
4646
T s2 = sinp * sinp;
47+
T c2 = cosp * cosp;
48+
T one_minus_ks2 = kp + c2 - kp * c2;
4749
T k2 = k * k;
48-
T kp = 1 - k2;
4950
if(k == 1)
5051
result = sinp * (boost::math::sign)(cosp); // We get here by simplifying JacobiZeta[w, 1] in Mathematica, and the fact that 0 <= phi.
5152
else
5253
{
53-
typedef std::integral_constant<int,
54-
std::is_floating_point<T>::value&& std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 54) ? 0 :
55-
std::is_floating_point<T>::value && std::numeric_limits<T>::digits && (std::numeric_limits<T>::digits <= 64) ? 1 : 2
56-
> precision_tag_type;
57-
result = k2 * sinp * cosp * sqrt(1 - k2 * s2) * ellint_rj_imp(T(0), kp, T(1), T(1 - k2 * s2), pol) / (3 * ellint_k_imp(k, pol, precision_tag_type()));
54+
result = k2 * sinp * cosp * sqrt(one_minus_ks2) * ellint_rj_imp(T(0), kp, T(1), one_minus_ks2, pol) / (3 * ellint_k_imp(k, pol, kp));
5855
}
5956
return invert ? T(-result) : result;
6057
}
61-
58+
template <typename T, typename Policy>
59+
inline T jacobi_zeta_imp(T phi, T k, const Policy& pol)
60+
{
61+
return jacobi_zeta_imp(phi, k, pol, T(1 - k * k));
62+
}
6263
} // detail
6364

6465
template <class T1, class T2, class Policy>

‎test/Jamfile.v2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ project
5454
<toolset>msvc-7.1:<source>../vc71_fix//vc_fix
5555
<toolset>msvc-7.1:<pch>off
5656
<toolset>clang-6.0.0:<pch>off # added to see effect.
57+
<toolset>clang:<cxxflags>-Wno-literal-range # warning: magnitude of floating-point constant too small for type 'long double' [-Wliteral-range]
5758
<toolset>gcc,<target-os>windows:<pch>off
5859
<toolset>borland:<runtime-link>static
5960
# <toolset>msvc:<cxxflags>/wd4506 has no effect?

‎test/bezier_polynomial_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ void test_linear_precision()
173173
P[2] = (1-t)*P0[2] + t*Pf[2];
174174

175175
auto computed = bp(t);
176-
CHECK_ULP_CLOSE(P[0], computed[0], 3);
177-
CHECK_ULP_CLOSE(P[1], computed[1], 3);
178-
CHECK_ULP_CLOSE(P[2], computed[2], 3);
176+
CHECK_ULP_CLOSE(P[0], computed[0], 4);
177+
CHECK_ULP_CLOSE(P[1], computed[1], 4);
178+
CHECK_ULP_CLOSE(P[2], computed[2], 4);
179179

180180
std::array<Real, 3> dP;
181181
dP[0] = Pf[0] - P0[0];

‎test/cubic_roots_test.cpp

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,23 +126,33 @@ void test_ill_conditioned() {
126126
auto roots = cubic_roots<double>(1, 10000, 200, 1);
127127
CHECK_ABSOLUTE_ERROR(expected_roots[0], roots[0],
128128
std::numeric_limits<double>::epsilon());
129-
CHECK_ABSOLUTE_ERROR(expected_roots[1], roots[1], 1.01e-5);
130-
CHECK_ABSOLUTE_ERROR(expected_roots[2], roots[2], 1.01e-5);
131-
double cond =
132-
cubic_root_condition_number<double>(1, 10000, 200, 1, roots[1]);
133-
double r1 = expected_roots[1];
134-
// The factor of 10 is a fudge factor to make the test pass.
135-
// Nonetheless, it does show this is basically correct:
136-
CHECK_LE(abs(r1 - roots[1]) / abs(r1),
137-
10 * std::numeric_limits<double>::epsilon() * cond);
138-
139-
cond = cubic_root_condition_number<double>(1, 10000, 200, 1, roots[2]);
140-
double r2 = expected_roots[2];
141-
// The factor of 10 is a fudge factor to make the test pass.
142-
// Nonetheless, it does show this is basically correct:
143-
CHECK_LE(abs(r2 - roots[2]) / abs(r2),
144-
10 * std::numeric_limits<double>::epsilon() * cond);
145129

130+
if (!(boost::math::isnan)(roots[1]))
131+
{
132+
// This test is so ill-conditioned, that we can't always get here.
133+
// Test case is Clang C++20 mode on MacOS Arm. Best guess is that
134+
// fma is behaving differently there...
135+
CHECK_ABSOLUTE_ERROR(expected_roots[1], roots[1], 1.01e-5);
136+
CHECK_ABSOLUTE_ERROR(expected_roots[2], roots[2], 1.01e-5);
137+
double cond =
138+
cubic_root_condition_number<double>(1, 10000, 200, 1, roots[1]);
139+
double r1 = expected_roots[1];
140+
// The factor of 10 is a fudge factor to make the test pass.
141+
// Nonetheless, it does show this is basically correct:
142+
CHECK_LE(abs(r1 - roots[1]) / abs(r1),
143+
10 * std::numeric_limits<double>::epsilon() * cond);
144+
145+
cond = cubic_root_condition_number<double>(1, 10000, 200, 1, roots[2]);
146+
double r2 = expected_roots[2];
147+
// The factor of 10 is a fudge factor to make the test pass.
148+
// Nonetheless, it does show this is basically correct:
149+
CHECK_LE(abs(r2 - roots[2]) / abs(r2),
150+
10 * std::numeric_limits<double>::epsilon() * cond);
151+
}
152+
else
153+
{
154+
CHECK_NAN(roots[2]);
155+
}
146156
// See https://github.com/boostorg/math/issues/757:
147157
// The polynomial is ((x+1)^2+1)*(x+1) which has roots -1, and two complex
148158
// roots:

‎test/linear_regression_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ void test_scaling_relations()
223223
Real c1_lambda = std::get<1>(temp);
224224
Real Rsquared_lambda = std::get<2>(temp);
225225

226-
CHECK_ULP_CLOSE(lambda*c0, c0_lambda, 30);
226+
CHECK_ULP_CLOSE(lambda*c0, c0_lambda, 50);
227227
CHECK_ULP_CLOSE(lambda*c1, c1_lambda, 30);
228228
CHECK_ULP_CLOSE(Rsquared, Rsquared_lambda, 3);
229229

‎test/test_autodiff_5.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(chebyshev_hpp, T, all_float_types) {
5959
BOOST_CHECK_CLOSE(
6060
boost::math::chebyshev_t(n, make_fvar<T, m>(x)).derivative(0u),
6161
boost::math::chebyshev_t(n, x), 40 * test_constants::pct_epsilon());
62-
62+
// Lower accuracy with clang/apple:
6363
BOOST_CHECK_CLOSE(
6464
boost::math::chebyshev_u(n, make_fvar<T, m>(x)).derivative(0u),
65-
boost::math::chebyshev_u(n, x), 40 * test_constants::pct_epsilon());
65+
boost::math::chebyshev_u(n, x), 80 * test_constants::pct_epsilon());
6666

6767
BOOST_CHECK_CLOSE(
6868
boost::math::chebyshev_t_prime(n, make_fvar<T, m>(x)).derivative(0u),

‎test/test_autodiff_8.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
BOOST_AUTO_TEST_SUITE(test_autodiff_8)
1010

11+
// This workaround is a temporary fix for Clang on Apple:
12+
#if !defined(__clang__) || !defined(__APPLE__) || !defined(__MACH__)
1113
BOOST_AUTO_TEST_CASE_TEMPLATE(hermite_hpp, T, all_float_types) {
1214
using test_constants = test_constants_t<T>;
1315
static constexpr auto m = test_constants::order;
@@ -19,7 +21,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(hermite_hpp, T, all_float_types) {
1921
BOOST_CHECK(isNearZero(autodiff_v.derivative(0u) - anchor_v));
2022
}
2123
}
22-
24+
#endif
2325
BOOST_AUTO_TEST_CASE_TEMPLATE(heuman_lambda_hpp, T, all_float_types) {
2426
using test_constants = test_constants_t<T>;
2527
static constexpr auto m = test_constants::order;
@@ -130,6 +132,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(jacobi_zeta_hpp, T, all_float_types) {
130132
}
131133
}
132134

135+
#if !defined(__clang__) || !defined(__APPLE__) || !defined(__MACH__)
133136
BOOST_AUTO_TEST_CASE_TEMPLATE(laguerre_hpp, T, all_float_types) {
134137
using boost::multiprecision::min;
135138
using std::min;
@@ -158,7 +161,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(laguerre_hpp, T, all_float_types) {
158161
}
159162
}
160163
}
161-
164+
#endif
162165
BOOST_AUTO_TEST_CASE_TEMPLATE(lambert_w_hpp, T, all_float_types) {
163166
using boost::math::nextafter;
164167
using boost::math::tools::max;

‎test/test_binomial.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,12 @@ void test_spots(RealType T)
716716

717717
check_out_of_range<boost::math::binomial_distribution<RealType> >(1, 1); // (All) valid constructor parameter values.
718718

719+
#if !(defined(__clang__) && defined( __APPLE__))
719720
// See bug reported here: https://github.com/boostorg/math/pull/1007
721+
//
722+
// This test case is so extreme that the incomplete beta basically gets
723+
// no digits in the result correct, as a result expect some failures on
724+
// some platforms.
720725
{
721726
using namespace boost::math::policies;
722727
typedef policy<discrete_quantile<integer_round_outwards> > Policy;
@@ -725,7 +730,7 @@ void test_spots(RealType T)
725730
// make sure it is not stuck.
726731
BOOST_CHECK_CLOSE(quantile(dist, 0.0365346), 5101148604445670400, 1e12);
727732
}
728-
733+
#endif
729734
} // template <class RealType>void test_spots(RealType)
730735

731736
BOOST_AUTO_TEST_CASE( test_main )

‎test/test_polygamma.cpp

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,23 @@ void expected_results()
2626
#else
2727
largest_type = "(long\\s+)?double|real_concept";
2828
#endif
29-
29+
#if defined(__APPLE__ ) && defined(__clang__)
30+
add_expected_result(
31+
".*", // compiler
32+
".*", // stdlib
33+
".*", // platform
34+
largest_type, // test type(s)
35+
".*large arguments", // test data group
36+
".*", 700, 200); // test function
37+
#else
3038
add_expected_result(
3139
".*", // compiler
3240
".*", // stdlib
3341
".*", // platform
3442
largest_type, // test type(s)
3543
".*large arguments", // test data group
3644
".*", 400, 200); // test function
45+
#endif
3746
add_expected_result(
3847
".*", // compiler
3948
".*", // stdlib

‎test/test_t_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void test_multiprecision_exact_mean()
5555
Real computed_statistic = std::get<0>(temp);
5656
Real computed_pvalue = std::get<1>(temp);
5757

58-
CHECK_MOLLIFIED_CLOSE(Real(0), computed_statistic, 15*std::numeric_limits<Real>::epsilon());
59-
CHECK_ULP_CLOSE(Real(1), computed_pvalue, 25);
58+
CHECK_MOLLIFIED_CLOSE(Real(0), computed_statistic, 20*std::numeric_limits<Real>::epsilon());
59+
CHECK_ULP_CLOSE(Real(1), computed_pvalue, 35);
6060
}
6161

6262
template<typename Z>

0 commit comments

Comments
 (0)