Skip to content

Define C++20 concepts #848

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

Open
mborland wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Define C++20 concepts #848

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a72ab6c
Define C++20 concepts
mborland Oct 16, 2022
c495bf7
Add intel _Quad type
mborland Oct 17, 2022
a4cd40f
Add arbitrary arithmetic concepts
mborland Oct 17, 2022
b5344d5
Add test on special function (beta)
mborland Oct 17, 2022
7252320
Add policy concept
mborland Oct 17, 2022
046217c
Iterator concept example in statistics
mborland Oct 17, 2022
e9af348
Tighten definitions of built-in concepts by excluding 128 bit extensions
mborland Oct 18, 2022
9a0905a
Add definition for container
mborland Oct 18, 2022
b56de86
Workaround for libcpp++ partial implementation of concepts
mborland Oct 18, 2022
b802b7c
Add complex number support
mborland Oct 18, 2022
b03cbf5
Add execution policy concept
mborland Oct 18, 2022
6bd07ec
Add any numerical type (int, floating, complex) concept
mborland Oct 18, 2022
5b81a37
Remove libc++ workaround
mborland Oct 19, 2022
3420530
Define our own derived_from as std not available on all platforms
mborland Oct 19, 2022
7a0ea9b
Merge branch 'concepts' of https://github.com/mborland/math into conc…
jzmaddock Nov 4, 2022
7fa561d
Update log1p for concept tests.
jzmaddock Nov 11, 2022
1fb3a58
Merge remote-tracking branch 'upstream/develop' into concepts
mborland Nov 14, 2022
054214c
Merge remote-tracking branch 'upstream/concepts' into concepts
mborland Nov 14, 2022
2f889d4
Change concept to allow integer promotion to double a la STL
mborland Nov 19, 2022
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
Prev Previous commit
Next Next commit
Update log1p for concept tests.
  • Loading branch information
@jzmaddock
jzmaddock committed Nov 11, 2022
commit 7fa561dd59f71cef96b1ec46fe7ec97087e6185b
23 changes: 12 additions & 11 deletions include/boost/math/special_functions/log1p.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <boost/math/special_functions/math_fwd.hpp>
#include <boost/math/tools/assert.hpp>
#include <boost/math/special_functions/fpclassify.hpp>
#include <boost/math/concepts/concepts.hpp>

#if defined(__GNUC__) && defined(BOOST_MATH_USE_FLOAT128)
//
Expand Down Expand Up @@ -293,7 +294,7 @@ const typename log1p_initializer<T, Policy, tag>::init log1p_initializer<T, Poli

} // namespace detail

template <class T, class Policy>
template <BOOST_MATH_ARBITRARY_REAL T, BOOST_MATH_POLICY Policy>
inline typename tools::promote_args<T>::type log1p(T x, const Policy&)
{
typedef typename tools::promote_args<T>::type result_type;
Expand Down Expand Up @@ -327,7 +328,7 @@ inline typename tools::promote_args<T>::type log1p(T x, const Policy&)

#if defined(BOOST_HAS_LOG1P) && !(defined(__osf__) && defined(__DECCXX_VER))
# ifdef BOOST_MATH_USE_C99
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline float log1p(float x, const Policy& pol)
{
if(x < -1)
Expand All @@ -339,7 +340,7 @@ inline float log1p(float x, const Policy& pol)
return ::log1pf(x);
}
#ifndef BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline long double log1p(long double x, const Policy& pol)
{
if(x < -1)
Expand All @@ -352,7 +353,7 @@ inline long double log1p(long double x, const Policy& pol)
}
#endif
#else
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline float log1p(float x, const Policy& pol)
{
if(x < -1)
Expand All @@ -364,7 +365,7 @@ inline float log1p(float x, const Policy& pol)
return ::log1p(x);
}
#endif
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline double log1p(double x, const Policy& pol)
{
if(x < -1)
Expand All @@ -381,7 +382,7 @@ inline double log1p(double x, const Policy& pol)
// that your compilers optimizer won't mess this code up!!
// Currently tested with VC8 and Intel 9.1.
//
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline double log1p(double x, const Policy& pol)
{
if(x < -1)
Expand All @@ -396,7 +397,7 @@ inline double log1p(double x, const Policy& pol)
else
return ::log(u)*(x/(u-1.0));
}
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline float log1p(float x, const Policy& pol)
{
return static_cast<float>(boost::math::log1p(static_cast<double>(x), pol));
Expand All @@ -406,7 +407,7 @@ inline float log1p(float x, const Policy& pol)
// For some reason this fails to compile under WinCE...
// Needs more investigation.
//
template <class Policy>
template <BOOST_MATH_POLICY Policy>
inline long double log1p(long double x, const Policy& pol)
{
if(x < -1)
Expand All @@ -424,15 +425,15 @@ inline long double log1p(long double x, const Policy& pol)
#endif
#endif

template <class T>
template <BOOST_MATH_ARBITRARY_REAL T>
inline typename tools::promote_args<T>::type log1p(T x)
{
return boost::math::log1p(x, policies::policy<>());
}
//
// Compute log(1+x)-x:
//
template <class T, class Policy>
template <BOOST_MATH_ARBITRARY_REAL T, BOOST_MATH_POLICY Policy>
inline typename tools::promote_args<T>::type
log1pmx(T x, const Policy& pol)
{
Expand Down Expand Up @@ -464,7 +465,7 @@ inline typename tools::promote_args<T>::type
return result;
}

template <class T>
template <BOOST_MATH_ARBITRARY_REAL T>
inline typename tools::promote_args<T>::type log1pmx(T x)
{
return log1pmx(x, policies::policy<>());
Expand Down
9 changes: 5 additions & 4 deletions include/boost/math/special_functions/math_fwd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <boost/math/special_functions/detail/round_fwd.hpp>
#include <boost/math/tools/promotion.hpp> // for argument promotion.
#include <boost/math/policies/policy.hpp>
#include <boost/math/concepts/concepts.hpp>

#define BOOST_NO_MACRO_EXPAND /**/

Expand Down Expand Up @@ -567,17 +568,17 @@ namespace boost
typename tools::promote_args<RT>::type cbrt(RT z, const Policy&);

// log1p is log(x + 1)
template <class T>
template <BOOST_MATH_ARBITRARY_REAL T>
typename tools::promote_args<T>::type log1p(T);

template <class T, class Policy>
template <BOOST_MATH_ARBITRARY_REAL T, BOOST_MATH_POLICY Policy>
typename tools::promote_args<T>::type log1p(T, const Policy&);

// log1pmx is log(x + 1) - x
template <class T>
template <BOOST_MATH_ARBITRARY_REAL T>
typename tools::promote_args<T>::type log1pmx(T);

template <class T, class Policy>
template <BOOST_MATH_ARBITRARY_REAL T, BOOST_MATH_POLICY Policy>
typename tools::promote_args<T>::type log1pmx(T, const Policy&);

// Exp (x) minus 1 functions.
Expand Down