add c++14 constexpr spectrum and wave genarator algorithms

This commit is contained in:
bolero-MURAKAMI 2014-04-20 15:25:25 +09:00
parent d1fc657c1f
commit cc48f3585a
29 changed files with 506 additions and 77 deletions

View file

@ -17,6 +17,8 @@
#include <sprout/container/indexes.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/iterator/amplitude_spectrum_iterator.hpp>
#include <sprout/iterator/type_traits/is_iterator_of.hpp>
#include <sprout/type_traits/enabler_if.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/pit/pit.hpp>
#include <sprout/math/less.hpp>
@ -60,26 +62,26 @@ namespace sprout {
);
}
template<typename ForwardIterator, typename Result, typename... Args>
template<typename InputIterator, typename Result, typename... Args>
inline SPROUT_CONSTEXPR typename std::enable_if<
sprout::container_traits<Result>::static_size == sizeof...(Args),
typename sprout::fixed::results::algorithm<Result>::type
>::type
amplitude_spectrum_impl(
ForwardIterator, ForwardIterator, Result const& result,
InputIterator, InputIterator, Result const& result,
typename sprout::container_traits<Result>::size_type,
Args const&... args
)
{
return sprout::remake<Result>(result, sprout::size(result), args...);
}
template<typename ForwardIterator, typename Result, typename... Args>
template<typename InputIterator, typename Result, typename... Args>
inline SPROUT_CONSTEXPR typename std::enable_if<
sprout::container_traits<Result>::static_size != sizeof...(Args),
typename sprout::fixed::results::algorithm<Result>::type
>::type
amplitude_spectrum_impl(
ForwardIterator first, ForwardIterator last, Result const& result,
InputIterator first, InputIterator last, Result const& result,
typename sprout::container_traits<Result>::size_type size,
Args const&... args
)
@ -92,10 +94,10 @@ namespace sprout {
: sprout::detail::container_complate(result, args...)
;
}
template<typename ForwardIterator, typename Result>
template<typename InputIterator, typename Result>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
amplitude_spectrum(
ForwardIterator first, ForwardIterator last, Result const& result,
InputIterator first, InputIterator last, Result const& result,
std::forward_iterator_tag*
)
{
@ -134,14 +136,27 @@ namespace sprout {
return sprout::fixed::detail::amplitude_spectrum(first, last, result);
}
template<typename Result, typename ForwardIterator>
template<typename Result, typename InputIterator>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
amplitude_spectrum(ForwardIterator first, ForwardIterator last) {
amplitude_spectrum(InputIterator first, InputIterator last) {
return sprout::fixed::amplitude_spectrum(first, last, sprout::pit<Result>());
}
} // namespace fixed
using sprout::fixed::amplitude_spectrum;
template<
typename InputIterator, typename Result,
typename sprout::enabler_if<!sprout::is_iterator_outputable<Result>::value>::type = sprout::enabler
>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
amplitude_spectrum(InputIterator first, InputIterator last, Result const& result) {
return sprout::fixed::amplitude_spectrum(first, last, result);
}
template<typename Result, typename InputIterator>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
amplitude_spectrum(InputIterator first, InputIterator last) {
return sprout::fixed::amplitude_spectrum<Result>(first, last);
}
} // namespace sprout
#endif // #ifndef SPROUT_NUMERIC_DFT_FIXED_AMPLITUDE_SPECTRUM_HPP

View file

@ -17,6 +17,8 @@
#include <sprout/container/indexes.hpp>
#include <sprout/iterator/operation.hpp>
#include <sprout/iterator/phase_spectrum_iterator.hpp>
#include <sprout/iterator/type_traits/is_iterator_of.hpp>
#include <sprout/type_traits/enabler_if.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/pit/pit.hpp>
#include <sprout/math/less.hpp>
@ -60,26 +62,26 @@ namespace sprout {
);
}
template<typename ForwardIterator, typename Result, typename... Args>
template<typename InputIterator, typename Result, typename... Args>
inline SPROUT_CONSTEXPR typename std::enable_if<
sprout::container_traits<Result>::static_size == sizeof...(Args),
typename sprout::fixed::results::algorithm<Result>::type
>::type
phase_spectrum_impl(
ForwardIterator, ForwardIterator, Result const& result,
InputIterator, InputIterator, Result const& result,
typename sprout::container_traits<Result>::size_type,
Args const&... args
)
{
return sprout::remake<Result>(result, sprout::size(result), args...);
}
template<typename ForwardIterator, typename Result, typename... Args>
template<typename InputIterator, typename Result, typename... Args>
inline SPROUT_CONSTEXPR typename std::enable_if<
sprout::container_traits<Result>::static_size != sizeof...(Args),
typename sprout::fixed::results::algorithm<Result>::type
>::type
phase_spectrum_impl(
ForwardIterator first, ForwardIterator last, Result const& result,
InputIterator first, InputIterator last, Result const& result,
typename sprout::container_traits<Result>::size_type size,
Args const&... args
)
@ -92,10 +94,10 @@ namespace sprout {
: sprout::detail::container_complate(result, args...)
;
}
template<typename ForwardIterator, typename Result>
template<typename InputIterator, typename Result>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
phase_spectrum(
ForwardIterator first, ForwardIterator last, Result const& result,
InputIterator first, InputIterator last, Result const& result,
std::forward_iterator_tag*
)
{
@ -134,14 +136,27 @@ namespace sprout {
return sprout::fixed::detail::phase_spectrum(first, last, result);
}
template<typename Result, typename ForwardIterator>
template<typename Result, typename InputIterator>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
phase_spectrum(ForwardIterator first, ForwardIterator last) {
phase_spectrum(InputIterator first, InputIterator last) {
return sprout::fixed::phase_spectrum(first, last, sprout::pit<Result>());
}
} // namespace fixed
using sprout::fixed::phase_spectrum;
template<
typename InputIterator, typename Result,
typename sprout::enabler_if<!sprout::is_iterator_outputable<Result>::value>::type = sprout::enabler
>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
phase_spectrum(InputIterator first, InputIterator last, Result const& result) {
return sprout::fixed::phase_spectrum(first, last, result);
}
template<typename Result, typename InputIterator>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
phase_spectrum(InputIterator first, InputIterator last) {
return sprout::fixed::phase_spectrum<Result>(first, last);
}
} // namespace sprout
#endif // #ifndef SPROUT_NUMERIC_DFT_FIXED_PHASE_SPECTRUM_HPP

View file

@ -15,19 +15,12 @@
#include <sprout/container/indexes.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/pit/pit.hpp>
#include <sprout/math/floor.hpp>
#include <sprout/detail/container_complate.hpp>
#include <sprout/numeric/dft/detail/sawtooth.hpp>
namespace sprout {
namespace fixed {
namespace detail {
template<typename T>
inline SPROUT_CONSTEXPR T
sawtooth_value(T const& t) {
using sprout::floor;
return 2 * (t - floor(t + T(0.5)));
}
template<typename Container, sprout::index_t... Indexes>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Container>::type
sawtooth_impl(
@ -40,11 +33,10 @@ namespace sprout {
typename sprout::container_traits<Container>::size_type size
)
{
typedef typename sprout::container_traits<Container>::value_type value_type;
return sprout::remake<Container>(
cont, size,
(Indexes >= offset && Indexes < offset + size
? amplitude * sprout::fixed::detail::sawtooth_value(frequency * value_type(Indexes) + phase)
? sprout::detail::sawtooth_value(frequency, amplitude, phase, Indexes)
: *sprout::next(sprout::internal_begin(cont), Indexes)
)...
);

View file

@ -15,9 +15,8 @@
#include <sprout/container/indexes.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/pit/pit.hpp>
#include <sprout/math/constants.hpp>
#include <sprout/math/sin.hpp>
#include <sprout/detail/container_complate.hpp>
#include <sprout/numeric/dft/detail/sinusoid.hpp>
namespace sprout {
namespace fixed {
@ -35,11 +34,10 @@ namespace sprout {
)
{
typedef typename sprout::container_traits<Container>::value_type value_type;
using sprout::sin;
return sprout::remake<Container>(
cont, size,
(Indexes >= offset && Indexes < offset + size
? amplitude * sin(d * value_type(Indexes) + phase)
? sprout::detail::sinusoid_value(amplitude, phase, d, Indexes)
: *sprout::next(sprout::internal_begin(cont), Indexes)
)...
);
@ -56,7 +54,7 @@ namespace sprout {
typedef typename sprout::container_traits<Container>::value_type value_type;
return sprout::fixed::detail::sinusoid_impl(
cont,
sprout::math::two_pi<value_type>() * frequency / value_type(sprout::size(cont)),
sprout::detail::sinusoid_value_d(frequency, sprout::size(cont)),
amplitude,
phase,
sprout::container_indexes<Container>::make(),

View file

@ -9,8 +9,11 @@
#define SPROUT_NUMERIC_DFT_FIXED_SPECTRUM_HPP
#include <sprout/config.hpp>
#include <sprout/iterator/type_traits/is_iterator_of.hpp>
#include <sprout/type_traits/enabler_if.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/numeric/dft/fixed/amplitude_spectrum.hpp>
#include <sprout/numeric/dft/fixed/phase_spectrum.hpp>
namespace sprout {
namespace fixed {
@ -30,9 +33,20 @@ namespace sprout {
}
} // namespace fixed
using sprout::fixed::spectrum;
template<
typename InputIterator, typename Result,
typename sprout::enabler_if<!sprout::is_iterator_outputable<Result>::value>::type = sprout::enabler
>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
spectrum(InputIterator first, InputIterator last, Result const& result) {
return sprout::fixed::spectrum(first, last, result);
}
template<typename Result, typename InputIterator>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Result>::type
spectrum(InputIterator first, InputIterator last) {
return sprout::fixed::spectrum<Result>(first, last);
}
} // namespace sprout
#include <sprout/numeric/dft/fixed/phase_spectrum.hpp>
#endif // #ifndef SPROUT_NUMERIC_DFT_FIXED_SPECTRUM_HPP

View file

@ -15,18 +15,12 @@
#include <sprout/container/indexes.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/pit/pit.hpp>
#include <sprout/numeric/dft/fixed/sawtooth.hpp>
#include <sprout/detail/container_complate.hpp>
#include <sprout/numeric/dft/detail/square.hpp>
namespace sprout {
namespace fixed {
namespace detail {
template<typename T>
inline SPROUT_CONSTEXPR T
square_value(T const& t, T const& d) {
return sprout::fixed::detail::sawtooth_value(t) - sprout::fixed::detail::sawtooth_value(t - d);
}
template<typename Container, sprout::index_t... Indexes>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Container>::type
square_impl(
@ -40,11 +34,10 @@ namespace sprout {
typename sprout::container_traits<Container>::size_type size
)
{
typedef typename sprout::container_traits<Container>::value_type value_type;
return sprout::remake<Container>(
cont, size,
(Indexes >= offset && Indexes < offset + size
? amplitude * sprout::fixed::detail::square_value(frequency * value_type(Indexes) + phase, duty)
? sprout::detail::square_value(frequency, amplitude, phase, duty, Indexes)
: *sprout::next(sprout::internal_begin(cont), Indexes)
)...
);

View file

@ -15,22 +15,12 @@
#include <sprout/container/indexes.hpp>
#include <sprout/algorithm/fixed/results.hpp>
#include <sprout/pit/pit.hpp>
#include <sprout/math/sin.hpp>
#include <sprout/math/asin.hpp>
#include <sprout/math/constants.hpp>
#include <sprout/detail/container_complate.hpp>
#include <sprout/numeric/dft/detail/triangle.hpp>
namespace sprout {
namespace fixed {
namespace detail {
template<typename T>
inline SPROUT_CONSTEXPR T
triangle_value(T const& t) {
using sprout::sin;
using sprout::asin;
return T(sprout::math::two_div_pi<double>()) * asin(sin(T(sprout::math::two_pi<double>()) * t));
}
template<typename Container, sprout::index_t... Indexes>
inline SPROUT_CONSTEXPR typename sprout::fixed::results::algorithm<Container>::type
triangle_impl(
@ -43,11 +33,10 @@ namespace sprout {
typename sprout::container_traits<Container>::size_type size
)
{
typedef typename sprout::container_traits<Container>::value_type value_type;
return sprout::remake<Container>(
cont, size,
(Indexes >= offset && Indexes < offset + size
? amplitude * sprout::fixed::detail::triangle_value(frequency * value_type(Indexes) + phase)
? sprout::detail::triangle_value(frequency, amplitude, phase, Indexes)
: *sprout::next(sprout::internal_begin(cont), Indexes)
)...
);