songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverted broken revision r67957

This commit is contained in:
Philipp Möller 2012-03-07 14:21:07 +00:00
parent e0dd26123d
commit eda2ce42a7
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Spatial_sorting/include/CGAL/hilbert_sort.h
View File

@ -28,12 +28,9 @@
#include <CGAL/Hilbert_sort_3.h> #include <CGAL/Hilbert_sort_3.h>
#include <CGAL/Hilbert_sort_d.h> #include <CGAL/Hilbert_sort_d.h>
#include <CGAL/random_shuffle.h>
#include <boost/random.hpp> #include <boost/random.hpp>
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
#include <algorithm> #include <algorithm>
namespace CGAL { namespace CGAL {
@ -46,10 +43,10 @@ namespace internal {
RandomAccessIterator end, RandomAccessIterator end,
Policy /*policy*/, Policy /*policy*/,
const Kernel &k, typename Kernel::Point_2 *) const Kernel &k, typename Kernel::Point_2 *)
CGAL::random_shuffle(begin,end, rng); {
boost::rand48 random; boost::rand48 random;
boost::random_number_generator<boost::rand48> rng(random); boost::random_number_generator<boost::rand48> rng(random);
CGAL::random_shuffle(begin,end, rng); std::random_shuffle(begin,end, rng);
(Hilbert_sort_2<Kernel, Policy> (k))(begin, end); (Hilbert_sort_2<Kernel, Policy> (k))(begin, end);
} }
@ -58,7 +55,7 @@ namespace internal {
RandomAccessIterator end, RandomAccessIterator end,
Policy /*policy*/, Policy /*policy*/,
const Kernel &k, typename Kernel::Point_3 *) const Kernel &k, typename Kernel::Point_3 *)
CGAL::random_shuffle(begin,end, rng); {
boost::rand48 random; boost::rand48 random;
boost::random_number_generator<boost::rand48> rng(random); boost::random_number_generator<boost::rand48> rng(random);
std::random_shuffle(begin,end, rng); std::random_shuffle(begin,end, rng);
@ -70,7 +67,7 @@ namespace internal {
RandomAccessIterator end, RandomAccessIterator end,
Policy /*policy*/, Policy /*policy*/,
const Kernel &k, typename Kernel::Point_d *) const Kernel &k, typename Kernel::Point_d *)
CGAL::random_shuffle(begin,end, rng); {
boost::rand48 random; boost::rand48 random;
boost::random_number_generator<boost::rand48> rng(random); boost::random_number_generator<boost::rand48> rng(random);
std::random_shuffle(begin,end, rng); std::random_shuffle(begin,end, rng);

7
Spatial_sorting/include/CGAL/spatial_sort.h
View File

@ -25,7 +25,6 @@
#include <CGAL/hilbert_sort.h> #include <CGAL/hilbert_sort.h>
#include <CGAL/Multiscale_sort.h> #include <CGAL/Multiscale_sort.h>
#include <CGAL/random_shuffle.h>
#include <boost/random.hpp> #include <boost/random.hpp>
#include <boost/random/linear_congruential.hpp> #include <boost/random/linear_congruential.hpp>
@ -50,7 +49,7 @@ namespace internal {
typedef Hilbert_sort_2<Kernel, Policy> Sort; typedef Hilbert_sort_2<Kernel, Policy> Sort;
boost::rand48 random; boost::rand48 random;
boost::random_number_generator<boost::rand48> rng(random); boost::random_number_generator<boost::rand48> rng(random);
CGAL::random_shuffle(begin,end,rng); std::random_shuffle(begin,end,rng);
if (threshold_hilbert==0) threshold_hilbert=4; if (threshold_hilbert==0) threshold_hilbert=4;
if (threshold_multiscale==0) threshold_multiscale=16; if (threshold_multiscale==0) threshold_multiscale=16;
@ -73,7 +72,7 @@ namespace internal {
typedef Hilbert_sort_3<Kernel, Policy> Sort; typedef Hilbert_sort_3<Kernel, Policy> Sort;
boost::rand48 random; boost::rand48 random;
boost::random_number_generator<boost::rand48> rng(random); boost::random_number_generator<boost::rand48> rng(random);
CGAL::random_shuffle(begin,end, rng); std::random_shuffle(begin,end, rng);
if (threshold_hilbert==0) threshold_hilbert=8; if (threshold_hilbert==0) threshold_hilbert=8;
if (threshold_multiscale==0) threshold_multiscale=64; if (threshold_multiscale==0) threshold_multiscale=64;
@ -96,7 +95,7 @@ namespace internal {
typedef Hilbert_sort_d<Kernel, Policy> Sort; typedef Hilbert_sort_d<Kernel, Policy> Sort;
boost::rand48 random; boost::rand48 random;
boost::random_number_generator<boost::rand48> rng(random); boost::random_number_generator<boost::rand48> rng(random);
CGAL::random_shuffle(begin,end, rng); std::random_shuffle(begin,end, rng);
if (threshold_hilbert==0) threshold_hilbert=10; if (threshold_hilbert==0) threshold_hilbert=10;
if (threshold_multiscale==0) threshold_multiscale=500; if (threshold_multiscale==0) threshold_multiscale=500;