Skip to content

Commit 2070190

Browse files
committed
Do not use the boost::variate_generator
Similar to the change https://github.com/PointCloudLibrary/pcl/pull/2956/files
1 parent a83fca8 commit 2070190

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Generator/include/CGAL/random_convex_hull_in_disc_2.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#ifndef CGAL_RANDOM_CONVEX_HULL_DISC_H
1818
#define CGAL_RANDOM_CONVEX_HULL_DISC_H 1
1919
#include <random>
20-
#include <boost/random.hpp>
20+
//#include <boost/random.hpp>
2121
#include <CGAL/Polygon_2_algorithms.h>
2222
#include <CGAL/function_objects.h>
2323
#include <CGAL/copy_n.h>
@@ -59,9 +59,9 @@ void generate_points_annulus(long n, double a, double b, double small_radius,
5959
GEN& gen) { // generate n points between a and b
6060
if (n > 1) {
6161
std::binomial_distribution<long> bin_distribution(n, .5);
62-
boost::variate_generator<GEN&, std::binomial_distribution<long> >
63-
g(gen, bin_distribution);
64-
long nb = g();
62+
//boost::variate_generator<GEN&, std::binomial_distribution<long> >
63+
// g(gen, bin_distribution);
64+
long nb = bin_distribution(gen);
6565
generate_points_annulus(nb, a, (a + b) / 2.0, small_radius, big_radius, l,
6666
gen);
6767
generate_points_annulus(n - nb, (a + b) / 2.0, b, small_radius, big_radius,
@@ -73,13 +73,13 @@ void generate_points_annulus(long n, double a, double b, double small_radius,
7373
small_radius * small_radius / (big_radius * big_radius), 1);
7474

7575
std::uniform_real_distribution<double> random_angle_distribution(a, b);
76-
boost::random::variate_generator<
77-
GEN&, std::uniform_real_distribution<double> > random_angle(gen, random_angle_distribution);
78-
boost::random::variate_generator<
79-
GEN&, std::uniform_real_distribution<double> > random_squared_radius(gen, random_squared_radius_distribution);
76+
//boost::random::variate_generator<
77+
// GEN&, std::uniform_real_distribution<double> > random_angle(gen, random_angle_distribution);
78+
//boost::random::variate_generator<
79+
// GEN&, std::uniform_real_distribution<double> > random_squared_radius(gen, random_squared_radius_distribution);
8080

81-
double alpha = random_angle();
82-
double r = big_radius * std::sqrt(random_squared_radius());
81+
double alpha = random_angle_distribution(gen);
82+
double r = big_radius * std::sqrt(random_squared_radius_distribution(gen));
8383
typedef Creator_uniform_2<double, P> Creator;
8484
Creator creator;
8585
typedef typename Creator::argument_type T;
@@ -219,11 +219,11 @@ void random_convex_hull_in_disc_2(std::size_t n, double radius, std::list<typena
219219
nb = static_cast<long>((std::min)(T, n - simulated_points));
220220
}
221221
std::binomial_distribution<long> dbin(nb, to_double(p_disc));
222-
boost::variate_generator<
223-
GEN&, std::binomial_distribution<long> > bin(gen, dbin);
222+
//boost::variate_generator<
223+
// GEN&, std::binomial_distribution<long> > bin(gen, dbin);
224224

225225
// How many points are falling in the small disc and won't be generated:
226-
long k_disc = bin();
226+
long k_disc = dbin(gen);
227227
simulated_points += k_disc;
228228

229229
std::list<P> m;

Generator/test/Generator/random_hull_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ main( )
1616

1717
Polygon_2 p,q;
1818
int n( 1000);
19-
boost::mt19937 gen(0);
19+
std::mt19937 gen(0);
2020

2121
// build random hull from n random points in a disc:
2222
random_convex_hull_in_disc_2(n,1.0,gen,std::back_inserter(p),K(), true);

0 commit comments

Comments
 (0)