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

Merge pull request #5630 from GilesBathgate/Box_intersection_d-simplify_segment_tree_iterative_radon-GilesBathgate 

Dependency inversion in Iterative_radon of segment_tree.h
This commit is contained in:
Laurent Rineau 2022-01-12 12:24:36 +01:00
parent fa4c12cb22 708e3d63b4
commit 5a1c67135d
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Box_intersection_d/include/CGAL/Box_intersection_d/segment_tree.h
View File

@ -207,24 +207,19 @@ median_of_three( RandomAccessIter a, RandomAccessIter b, RandomAccessIter c,
}
template< class RandomAccessIter, class Predicate_traits >
template< class RandomAccessIter, class Predicate_traits, class Generator>
class Iterative_radon {
RandomAccessIter begin;
std::ptrdiff_t size;
Predicate_traits traits;
int dim;
boost::rand48 rng;
boost::uniform_int<std::ptrdiff_t> dist;
boost::variate_generator<boost::rand48&, boost::uniform_int<std::ptrdiff_t> > generator;
Generator& generator;
public:
Iterative_radon( RandomAccessIter begin, RandomAccessIter end,
Predicate_traits traits, int dim, int /*num_levels*/ )
: begin(begin), size(end-begin), traits(traits), dim(dim),
rng(), dist(0,size-1), generator(rng,dist)
Iterative_radon( const RandomAccessIter& begin_, const Predicate_traits& traits_,
int dim_, Generator& generator_)
: begin(begin_), traits(traits_), dim(dim_), generator(generator_)
{}
RandomAccessIter
@ -247,7 +242,10 @@ RandomAccessIter
iterative_radon( RandomAccessIter begin, RandomAccessIter end,
Predicate_traits traits, int dim, int num_levels )
{
Iterative_radon<RandomAccessIter, Predicate_traits> IR(begin,end,traits,dim,num_levels);
typedef typename boost::variate_generator<boost::rand48&, boost::uniform_int<std::ptrdiff_t> > Generator;
boost::rand48 rng;
Generator generator(rng, boost::uniform_int<std::ptrdiff_t>(0, (end-begin)-1));
Iterative_radon<RandomAccessIter, Predicate_traits, Generator> IR(begin, traits, dim, generator);
return IR(num_levels);
}