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

Misc minor changes

This commit is contained in:
Mael Rouxel-Labbé 2017-08-23 17:15:44 +02:00
parent 16ce117040
commit 3640902c6f
9 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alpha_shapes_2/include/CGAL/Alpha_shape_2.h
View File

@ -81,7 +81,7 @@ public:
typedef Type_of_alpha NT; typedef Type_of_alpha NT;
typedef Type_of_alpha FT; typedef Type_of_alpha FT;
//check simplices are correctly instantiated // check that simplices are correctly instantiated
CGAL_static_assertion( (boost::is_same<NT, typename Dt::Face::NT>::value) ); CGAL_static_assertion( (boost::is_same<NT, typename Dt::Face::NT>::value) );
CGAL_static_assertion( (boost::is_same<NT, typename Dt::Vertex::NT>::value) ); CGAL_static_assertion( (boost::is_same<NT, typename Dt::Vertex::NT>::value) );

11
Alpha_shapes_3/examples/Alpha_shapes_3/ex_alpha_shapes_3.cpp
View File

@ -27,21 +27,22 @@ int main()
is >> n; is >> n;
std::cout << "Reading " << n << " points " << std::endl; std::cout << "Reading " << n << " points " << std::endl;
Point p; Point p;
for( ; n>0 ; n--) { for( ; n>0 ; n--)
{
is >> p; is >> p;
lp.push_back(p); lp.push_back(p);
} }
// compute alpha shape // compute alpha shape
Alpha_shape_3 as(lp.begin(),lp.end()); Alpha_shape_3 as(lp.begin(),lp.end());
std::cout << "Alpha shape computed in REGULARIZED mode by default" std::cout << "Alpha shape computed in REGULARIZED mode by default" << std::endl;
<< std::endl;
// find optimal alpha value // find optimal alpha value
Alpha_iterator opt = as.find_optimal_alpha(1); Alpha_iterator opt = as.find_optimal_alpha(1);
std::cout << "Optimal alpha value to get one connected component is " std::cout << "Optimal alpha value to get one connected component is " << *opt << std::endl;
<< *opt << std::endl;
as.set_alpha(*opt); as.set_alpha(*opt);
assert(as.number_of_solid_components() == 1); assert(as.number_of_solid_components() == 1);
return 0; return 0;
} }

1
Alpha_shapes_3/examples/Alpha_shapes_3/ex_alpha_shapes_exact_alpha.cpp
View File

@ -28,7 +28,6 @@ int main()
lp.push_back(Point(49.4264,32.6279,4.6205)); lp.push_back(Point(49.4264,32.6279,4.6205));
lp.push_back(Point(49.3127,30.3271,6.05503)); lp.push_back(Point(49.3127,30.3271,6.05503));
// compute alpha shape // compute alpha shape
Alpha_shape_3 as(lp.begin(),lp.end(),0,Alpha_shape_3::GENERAL); Alpha_shape_3 as(lp.begin(),lp.end(),0,Alpha_shape_3::GENERAL);

1
Alpha_shapes_3/include/CGAL/Alpha_shape_3.h
View File

@ -114,6 +114,7 @@ public:
typedef typename internal::Alpha_nt_selector_3<Gt,ExactAlphaComparisonTag,typename Dt::Weighted_tag>::Compute_squared_radius_3 Compute_squared_radius_3; typedef typename internal::Alpha_nt_selector_3<Gt,ExactAlphaComparisonTag,typename Dt::Weighted_tag>::Compute_squared_radius_3 Compute_squared_radius_3;
typedef NT FT; typedef NT FT;
typedef typename Gt::FT Coord_type; typedef typename Gt::FT Coord_type;
//checks whether tags are correctly set in Vertex and Cell classes //checks whether tags are correctly set in Vertex and Cell classes
CGAL_static_assertion( (boost::is_same<NT,typename Dt::Cell::NT>::value) ); CGAL_static_assertion( (boost::is_same<NT,typename Dt::Cell::NT>::value) );
CGAL_static_assertion( (boost::is_same<NT,typename Dt::Vertex::Alpha_status::NT>::value) ); CGAL_static_assertion( (boost::is_same<NT,typename Dt::Vertex::Alpha_status::NT>::value) );

6
Alpha_shapes_3/test/Alpha_shapes_3/test_alpha_shape_3.cpp
View File

@ -12,14 +12,8 @@
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
// //
// $URL$
// $Id$
// $Date$
//
//
// Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr> // Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>

5
Alpha_shapes_3/test/Alpha_shapes_3/test_weighted_alpha_shape_3.cpp
View File

@ -12,11 +12,6 @@
// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE // This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
// //
// $URL$
// $Id$
// $Date$
//
//
// Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr> // Author(s) : Mariette Yvinec <Mariette.Yvinec@sophia.inria.fr>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>

2
Periodic_3_triangulation_3/include/CGAL/Periodic_3_regular_triangulation_3.h
View File

@ -907,7 +907,7 @@ public:
protected: protected:
// Protected, because inheritors(e.g. periodic triangulation for meshing) // Protected, because inheritors(e.g. periodic triangulation for meshing)
// of the class Periodic_3_Delaunay_triangulation_3 use this class // of the class Periodic_3_regular_triangulation_3 use this class
class Conflict_tester; class Conflict_tester;
private: private: