mirror of https://github.com/CGAL/cgal
commit
a6316bb6c0
|
|
@ -30,17 +30,17 @@ void k_delaunay(Regular& rt,input_DS& input_wpt,int order){
|
||||||
typedef typename Kernel::Point_2 Point_2;
|
typedef typename Kernel::Point_2 Point_2;
|
||||||
typedef typename Kernel::Weighted_point_2 Weighted_point_2;
|
typedef typename Kernel::Weighted_point_2 Weighted_point_2;
|
||||||
|
|
||||||
std::vector<typename input_DS::iterator> Current_sel;//DS that will contain all possible combinaisons of k points (iterator), where k is the order
|
std::vector<typename input_DS::iterator> Current_sel;//DS that will contain all possible combinations of k points (iterator), where k is the order
|
||||||
typename input_DS::iterator it_wpt = input_wpt.begin();
|
typename input_DS::iterator it_wpt = input_wpt.begin();
|
||||||
typename input_DS::iterator stop_combi = input_wpt.end();
|
typename input_DS::iterator stop_combi = input_wpt.end();
|
||||||
for(int i=0;i<order-1;++i){ //First fill the DS with the k fist wpoints
|
for(int i=0;i<order-1;++i){ //First fill the DS with the k fist wpoints
|
||||||
Current_sel.push_back(it_wpt);//Useful to know when all combinaisons have been treated
|
Current_sel.push_back(it_wpt);//Useful to know when all combinations have been treated
|
||||||
++it_wpt;
|
++it_wpt;
|
||||||
}
|
}
|
||||||
--it_wpt;
|
--it_wpt;
|
||||||
Current_sel.push_back(it_wpt);
|
Current_sel.push_back(it_wpt);
|
||||||
|
|
||||||
for(int i=0;i<order;++i){ //Fix end point for combinaison searching
|
for(int i=0;i<order;++i){ //Fix end point for combination searching
|
||||||
--stop_combi;
|
--stop_combi;
|
||||||
}
|
}
|
||||||
do{
|
do{
|
||||||
|
|
|
||||||
|
|
@ -1093,7 +1093,7 @@ namespace CommonKernelFunctors {
|
||||||
public:
|
public:
|
||||||
typedef FT result_type;
|
typedef FT result_type;
|
||||||
|
|
||||||
// There are 25 combinaisons, we use a template.
|
// There are 25 combinations, we use a template.
|
||||||
template <class T1, class T2>
|
template <class T1, class T2>
|
||||||
FT
|
FT
|
||||||
operator()( const T1& t1, const T2& t2) const
|
operator()( const T1& t1, const T2& t2) const
|
||||||
|
|
@ -1108,7 +1108,7 @@ namespace CommonKernelFunctors {
|
||||||
public:
|
public:
|
||||||
typedef FT result_type;
|
typedef FT result_type;
|
||||||
|
|
||||||
// There are 25 combinaisons, we use a template.
|
// There are 25 combinations, we use a template.
|
||||||
template <class T1, class T2>
|
template <class T1, class T2>
|
||||||
FT
|
FT
|
||||||
operator()( const T1& t1, const T2& t2) const
|
operator()( const T1& t1, const T2& t2) const
|
||||||
|
|
|
||||||
|
|
@ -387,7 +387,7 @@ void test()
|
||||||
assert(vertices(tm1).size() == 0);
|
assert(vertices(tm1).size() == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
// test combinaison of use_compact_clipper and clip_volume
|
// test combinations of use_compact_clipper and clip_volume
|
||||||
{
|
{
|
||||||
TriangleMesh tm1;
|
TriangleMesh tm1;
|
||||||
std::ifstream("data-coref/cube.off") >> tm1;
|
std::ifstream("data-coref/cube.off") >> tm1;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue