random: Add uniform_on_sphere_distribution definition.
2014-07-12 Ulrich Drepper <drepper@gmail.com> * include/ext/random: Add uniform_on_sphere_distribution definition. * include/ext/random.tcc: Add out-of-band member function definitions for uniform_on_sphere_distribution. * testsuite/ext/random/uniform_on_sphere_distribution/ cons/default.cc: New file. * testsuite/ext/random/uniform_on_sphere_distribution/ operators/equal.cc: New file. * testsuite/ext/random/uniform_on_sphere_distribution/ operators/inequal.cc: New file. * testsuite/ext/random/uniform_on_sphere_distribution/ operators/serialize.cc: New file. From-SVN: r212492
This commit is contained in:
parent
4a05a9a8d2
commit
863a2c7ecc
|
@ -1,3 +1,17 @@
|
|||
2014-07-12 Ulrich Drepper <drepper@gmail.com>
|
||||
|
||||
* include/ext/random: Add uniform_on_sphere_distribution definition.
|
||||
* include/ext/random.tcc: Add out-of-band member function definitions
|
||||
for uniform_on_sphere_distribution.
|
||||
* testsuite/ext/random/uniform_on_sphere_distribution/
|
||||
cons/default.cc: New file.
|
||||
* testsuite/ext/random/uniform_on_sphere_distribution/
|
||||
operators/equal.cc: New file.
|
||||
* testsuite/ext/random/uniform_on_sphere_distribution/
|
||||
operators/inequal.cc: New file.
|
||||
* testsuite/ext/random/uniform_on_sphere_distribution/
|
||||
operators/serialize.cc: New file.
|
||||
|
||||
2014-07-11 Edward Smith-Rowland <3dw4rd@verizon.net>
|
||||
|
||||
Add the logistic_distribution as an extension.
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#else
|
||||
|
||||
#include <random>
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <ext/cmath>
|
||||
#ifdef __SSE2__
|
||||
|
@ -3293,6 +3294,196 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
const logistic_distribution<_RealType1>& __d2)
|
||||
{ return !(__d1 == __d2); }
|
||||
|
||||
|
||||
/**
|
||||
* @brief A distribution for random coordinates on a unit sphere.
|
||||
*
|
||||
* The method used in the generation function is attributed by Donald Knuth
|
||||
* to G. W. Brown, Modern Mathematics for the Engineer (1956).
|
||||
*/
|
||||
template<std::size_t _Dimen, typename _RealType = double>
|
||||
class uniform_on_sphere_distribution
|
||||
{
|
||||
static_assert(std::is_floating_point<_RealType>::value,
|
||||
"template argument not a floating point type");
|
||||
static_assert(_Dimen != 0, "dimension is zero");
|
||||
|
||||
public:
|
||||
/** The type of the range of the distribution. */
|
||||
typedef std::array<_RealType, _Dimen> result_type;
|
||||
/** Parameter type. */
|
||||
struct param_type
|
||||
{
|
||||
explicit
|
||||
param_type()
|
||||
{ }
|
||||
|
||||
friend bool
|
||||
operator==(const param_type& __p1, const param_type& __p2)
|
||||
{ return true; }
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Constructs a uniform on sphere distribution.
|
||||
*/
|
||||
explicit
|
||||
uniform_on_sphere_distribution()
|
||||
: _M_param(), _M_n(_RealType(0), _RealType(1))
|
||||
{ }
|
||||
|
||||
explicit
|
||||
uniform_on_sphere_distribution(const param_type& __p)
|
||||
: _M_param(__p), _M_n(_RealType(0), _RealType(1))
|
||||
{ }
|
||||
|
||||
/**
|
||||
* @brief Resets the distribution state.
|
||||
*/
|
||||
void
|
||||
reset()
|
||||
{ }
|
||||
|
||||
/**
|
||||
* @brief Returns the parameter set of the distribution.
|
||||
*/
|
||||
param_type
|
||||
param() const
|
||||
{ return _M_param; }
|
||||
|
||||
/**
|
||||
* @brief Sets the parameter set of the distribution.
|
||||
* @param __param The new parameter set of the distribution.
|
||||
*/
|
||||
void
|
||||
param(const param_type& __param)
|
||||
{ _M_param = __param; }
|
||||
|
||||
/**
|
||||
* @brief Returns the greatest lower bound value of the distribution.
|
||||
* This function makes no sense for this distribution.
|
||||
*/
|
||||
result_type
|
||||
min() const
|
||||
{
|
||||
result_type __res;
|
||||
__res.fill(0);
|
||||
return __res;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Returns the least upper bound value of the distribution.
|
||||
* This function makes no sense for this distribution.
|
||||
*/
|
||||
result_type
|
||||
max() const
|
||||
{
|
||||
result_type __res;
|
||||
__res.fill(0);
|
||||
return __res;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Generating functions.
|
||||
*/
|
||||
template<typename _UniformRandomNumberGenerator>
|
||||
result_type
|
||||
operator()(_UniformRandomNumberGenerator& __urng)
|
||||
{ return this->operator()(__urng, _M_param); }
|
||||
|
||||
template<typename _UniformRandomNumberGenerator>
|
||||
result_type
|
||||
operator()(_UniformRandomNumberGenerator& __urng,
|
||||
const param_type& __p);
|
||||
|
||||
template<typename _ForwardIterator,
|
||||
typename _UniformRandomNumberGenerator>
|
||||
void
|
||||
__generate(_ForwardIterator __f, _ForwardIterator __t,
|
||||
_UniformRandomNumberGenerator& __urng)
|
||||
{ this->__generate(__f, __t, __urng, this->param()); }
|
||||
|
||||
template<typename _ForwardIterator,
|
||||
typename _UniformRandomNumberGenerator>
|
||||
void
|
||||
__generate(_ForwardIterator __f, _ForwardIterator __t,
|
||||
_UniformRandomNumberGenerator& __urng,
|
||||
const param_type& __p)
|
||||
{ this->__generate_impl(__f, __t, __urng, __p); }
|
||||
|
||||
template<typename _UniformRandomNumberGenerator>
|
||||
void
|
||||
__generate(result_type* __f, result_type* __t,
|
||||
_UniformRandomNumberGenerator& __urng,
|
||||
const param_type& __p)
|
||||
{ this->__generate_impl(__f, __t, __urng, __p); }
|
||||
|
||||
/**
|
||||
* @brief Return true if two uniform on sphere distributions have
|
||||
* the same parameters and the sequences that would be
|
||||
* generated are equal.
|
||||
*/
|
||||
friend bool
|
||||
operator==(const uniform_on_sphere_distribution& __d1,
|
||||
const uniform_on_sphere_distribution& __d2)
|
||||
{ return true; }
|
||||
|
||||
/**
|
||||
* @brief Inserts a %uniform_on_sphere_distribution random number distribution
|
||||
* @p __x into the output stream @p __os.
|
||||
*
|
||||
* @param __os An output stream.
|
||||
* @param __x A %uniform_on_sphere_distribution random number distribution.
|
||||
*
|
||||
* @returns The output stream with the state of @p __x inserted or in
|
||||
* an error state.
|
||||
*/
|
||||
template<size_t _Dimen1, typename _RealType1, typename _CharT,
|
||||
typename _Traits>
|
||||
friend std::basic_ostream<_CharT, _Traits>&
|
||||
operator<<(std::basic_ostream<_CharT, _Traits>& __os,
|
||||
const __gnu_cxx::uniform_on_sphere_distribution<_Dimen1,
|
||||
_RealType1>&
|
||||
__x);
|
||||
|
||||
/**
|
||||
* @brief Extracts a %uniform_on_sphere_distribution random number distribution
|
||||
* @p __x from the input stream @p __is.
|
||||
*
|
||||
* @param __is An input stream.
|
||||
* @param __x A %uniform_on_sphere_distribution random number generator engine.
|
||||
*
|
||||
* @returns The input stream with @p __x extracted or in an error state.
|
||||
*/
|
||||
template<std::size_t _Dimen1, typename _RealType1, typename _CharT,
|
||||
typename _Traits>
|
||||
friend std::basic_istream<_CharT, _Traits>&
|
||||
operator>>(std::basic_istream<_CharT, _Traits>& __is,
|
||||
__gnu_cxx::uniform_on_sphere_distribution<_Dimen1,
|
||||
_RealType1>& __x);
|
||||
|
||||
private:
|
||||
template<typename _ForwardIterator,
|
||||
typename _UniformRandomNumberGenerator>
|
||||
void
|
||||
__generate_impl(_ForwardIterator __f, _ForwardIterator __t,
|
||||
_UniformRandomNumberGenerator& __urng,
|
||||
const param_type& __p);
|
||||
|
||||
param_type _M_param;
|
||||
std::normal_distribution<_RealType> _M_n;
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Return true if two uniform on sphere distributions are different.
|
||||
*/
|
||||
template<std::size_t _Dimen, typename _RealType>
|
||||
inline bool
|
||||
operator!=(const __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
|
||||
_RealType>& __d1,
|
||||
const __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
|
||||
_RealType>& __d2)
|
||||
{ return false; }
|
||||
|
||||
_GLIBCXX_END_NAMESPACE_VERSION
|
||||
} // namespace __gnu_cxx
|
||||
|
||||
|
|
|
@ -1539,6 +1539,65 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
|||
return __is;
|
||||
}
|
||||
|
||||
|
||||
template<std::size_t _Dimen, typename _RealType>
|
||||
template<typename _UniformRandomNumberGenerator>
|
||||
typename uniform_on_sphere_distribution<_Dimen, _RealType>::result_type
|
||||
uniform_on_sphere_distribution<_Dimen, _RealType>::
|
||||
operator()(_UniformRandomNumberGenerator& __urng,
|
||||
const param_type& __p)
|
||||
{
|
||||
result_type __ret;
|
||||
_RealType __sum = _RealType(0);
|
||||
|
||||
std::generate(__ret.begin(), __ret.end(),
|
||||
[&__urng, &__sum, this](){ _RealType __t = _M_n(__urng);
|
||||
__sum += __t * __t;
|
||||
return __t; });
|
||||
auto __norm = std::sqrt(__sum);
|
||||
std::transform(__ret.begin(), __ret.end(), __ret.begin(),
|
||||
[__norm](_RealType __val){ return __val / __norm; });
|
||||
|
||||
return __ret;
|
||||
}
|
||||
|
||||
template<std::size_t _Dimen, typename _RealType>
|
||||
template<typename _OutputIterator,
|
||||
typename _UniformRandomNumberGenerator>
|
||||
void
|
||||
uniform_on_sphere_distribution<_Dimen, _RealType>::
|
||||
__generate_impl(_OutputIterator __f, _OutputIterator __t,
|
||||
_UniformRandomNumberGenerator& __urng,
|
||||
const param_type& __param)
|
||||
{
|
||||
__glibcxx_function_requires(_OutputIteratorConcept<_OutputIterator>)
|
||||
|
||||
while (__f != __t)
|
||||
*__f++ = this->operator()(__urng, __param);
|
||||
}
|
||||
|
||||
template<std::size_t _Dimen, typename _RealType, typename _CharT,
|
||||
typename _Traits>
|
||||
std::basic_ostream<_CharT, _Traits>&
|
||||
operator<<(std::basic_ostream<_CharT, _Traits>& __os,
|
||||
const __gnu_cxx::uniform_on_sphere_distribution<_Dimen,
|
||||
_RealType>& __x)
|
||||
{
|
||||
// The distribution has no state, nothing to save.
|
||||
return __os;
|
||||
}
|
||||
|
||||
template<std::size_t _Dimen, typename _RealType, typename _CharT,
|
||||
typename _Traits>
|
||||
std::basic_istream<_CharT, _Traits>&
|
||||
operator>>(std::basic_istream<_CharT, _Traits>& __is,
|
||||
__gnu_cxx::uniform_on_sphere_distribution<_Dimen,
|
||||
_RealType>& __x)
|
||||
{
|
||||
// The distribution has no state, nothing to restore.
|
||||
return __is;
|
||||
}
|
||||
|
||||
_GLIBCXX_END_NAMESPACE_VERSION
|
||||
} // namespace
|
||||
|
||||
|
|
|
@ -0,0 +1,45 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-cstdint "" }
|
||||
//
|
||||
// 2014-04-15 Ulrich Drepper <drepper@gmail.com>
|
||||
//
|
||||
// Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 3, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING3. If not see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// 26.4.8.3.* Class template uniform_in_sphere [rand.dist.ext.uniform_on_sphere]
|
||||
// 26.4.2.4 Concept RandomNumberDistribution [rand.concept.dist]
|
||||
|
||||
#include <ext/random>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
void
|
||||
test01()
|
||||
{
|
||||
bool test [[gnu::unused]] = true;
|
||||
|
||||
__gnu_cxx::uniform_on_sphere_distribution<2> u2;
|
||||
__gnu_cxx::uniform_on_sphere_distribution<3> u3;
|
||||
__gnu_cxx::uniform_on_sphere_distribution<4, double> u4;
|
||||
__gnu_cxx::uniform_on_sphere_distribution<5, float> u5;
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
test01();
|
||||
return 0;
|
||||
}
|
|
@ -0,0 +1,43 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-cstdint "" }
|
||||
//
|
||||
// 2014-04-15 Ulrich Drepper <drepper@gmail.com>
|
||||
//
|
||||
// Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 3, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING3. If not see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// 26.5.8.4.5 Class template uniform_on_sphere_distribution [rand.dist.ext.uniform_on_sphere]
|
||||
|
||||
#include <ext/random>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
void
|
||||
test01()
|
||||
{
|
||||
bool test [[gnu::unused]] = true;
|
||||
|
||||
__gnu_cxx::uniform_on_sphere_distribution<3> u, v;
|
||||
|
||||
VERIFY( u == v );
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
test01();
|
||||
return 0;
|
||||
}
|
|
@ -0,0 +1,43 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-cstdint "" }
|
||||
//
|
||||
// 2014-04-15 Ulrich Drepper <drepper@gmail.com>
|
||||
//
|
||||
// Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 3, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING3. If not see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// 26.5.8.4.5 Class template uniform_on_sphere_distribution [rand.dist.ext.uniform_on_sphere]
|
||||
|
||||
#include <ext/random>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
void
|
||||
test01()
|
||||
{
|
||||
bool test [[gnu::unused]] = true;
|
||||
|
||||
__gnu_cxx::uniform_on_sphere_distribution<3> u, v;
|
||||
|
||||
VERIFY( !(u != v) );
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
test01();
|
||||
return 0;
|
||||
}
|
|
@ -0,0 +1,50 @@
|
|||
// { dg-options "-std=gnu++11" }
|
||||
// { dg-require-cstdint "" }
|
||||
//
|
||||
// 2014-04-15 Ulrich Drepper <drepper@gmail.com>
|
||||
//
|
||||
// Copyright (C) 2014 Free Software Foundation, Inc.
|
||||
//
|
||||
// This file is part of the GNU ISO C++ Library. This library is free
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
// terms of the GNU General Public License as published by the
|
||||
// Free Software Foundation; either version 3, or (at your option)
|
||||
// any later version.
|
||||
//
|
||||
// This library is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License along
|
||||
// with this library; see the file COPYING3. If not see
|
||||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// 26.4.8.3.* Class template uniform_on_sphere_distribution [rand.dist.ext.uniform_on_sphere]
|
||||
// 26.4.2.4 Concept RandomNumberDistribution [rand.concept.dist]
|
||||
|
||||
#include <ext/random>
|
||||
#include <sstream>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
void
|
||||
test01()
|
||||
{
|
||||
bool test [[gnu::unused]] = true;
|
||||
|
||||
std::stringstream str;
|
||||
__gnu_cxx::uniform_on_sphere_distribution<3> u, v;
|
||||
std::minstd_rand0 rng;
|
||||
|
||||
u(rng); // advance
|
||||
str << u;
|
||||
|
||||
str >> v;
|
||||
}
|
||||
|
||||
int
|
||||
main()
|
||||
{
|
||||
test01();
|
||||
return 0;
|
||||
}
|
Loading…
Reference in New Issue