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

cleaning

This commit is contained in:
Jane Tournois 2021-06-03 13:37:06 +02:00
parent c9596995bc
commit 570ffb7e1e
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Installation/include/CGAL/MDS_3/Mesh_complex_3_in_triangulation_3_fwd.h
View File

@ -27,11 +27,8 @@ namespace MDS_3 {
template<class Tr> template<class Tr>
bool build_triangulation_from_file(std::istream& is, bool build_triangulation_from_file(std::istream& is,
Tr& tr, Tr& tr,
bool replace_domain_0); bool verbose = false,
bool replace_domain_0 = false);
template<class Tr>
bool build_triangulation_from_file(std::istream& is,
Tr& tr);
} // MDS_3 } // MDS_3
} // CGAL } // CGAL

27
MDS_3/include/CGAL/MDS_3/tet_soup_to_c3t3.h
View File

@ -346,9 +346,6 @@ bool build_triangulation(Tr& tr,
const PointRange& points, const PointRange& points,
const CellRange& finite_cells, const CellRange& finite_cells,
const FacetPatchMap& border_facets, const FacetPatchMap& border_facets,
// const std::vector<typename Tr::Point>& points,
// const std::vector<std::array<int,5> >& finite_cells,
// const std::map<std::array<int,3>, typename Tr::Cell::Surface_patch_index>& border_facets,
std::vector<typename Tr::Vertex_handle>& vertex_handle_vector, std::vector<typename Tr::Vertex_handle>& vertex_handle_vector,
const bool verbose = false, const bool verbose = false,
bool replace_domain_0 = false) bool replace_domain_0 = false)
@ -399,7 +396,8 @@ bool build_triangulation(Tr& tr,
if(verbose) if(verbose)
std::cout << tr.number_of_vertices() << " vertices" << std::endl; std::cout << tr.number_of_vertices() << " vertices" << std::endl;
return tr.tds().is_valid(); return true;// tr.tds().is_valid();
//TDS not valid when cells do not cover the convex hull of vertices
} }
template<class Tr, template<class Tr,
@ -412,9 +410,6 @@ bool build_triangulation(Tr& tr,
const FacetPatchMap& border_facets, const FacetPatchMap& border_facets,
const bool verbose = false, const bool verbose = false,
bool replace_domain_0 = false) bool replace_domain_0 = false)
// const std::vector<typename Tr::Point>& points, //PointRange
// const std::vector<std::array<int, 5> >& finite_cells, //CellRange
// const std::map<std::array<int, 3>, typename Tr::Cell::Surface_patch_index>& border_facets,//FacetsMap
{ {
BOOST_STATIC_ASSERT(boost::is_same<typename Tr::Point, BOOST_STATIC_ASSERT(boost::is_same<typename Tr::Point,
typename PointRange::value_type>::value); typename PointRange::value_type>::value);
@ -428,6 +423,7 @@ bool build_triangulation(Tr& tr,
template<class Tr> template<class Tr>
bool build_triangulation_from_file(std::istream& is, bool build_triangulation_from_file(std::istream& is,
Tr& tr, Tr& tr,
const bool verbose,
bool replace_domain_0) bool replace_domain_0)
{ {
typedef typename Tr::Point Point_3; typedef typename Tr::Point Point_3;
@ -449,7 +445,9 @@ bool build_triangulation_from_file(std::istream& is,
CGAL_assertion(dim == 3); CGAL_assertion(dim == 3);
if(verbose)
std::cout << "Reading .mesh file..." << std::endl; std::cout << "Reading .mesh file..." << std::endl;
while(is >> word && word != "End") while(is >> word && word != "End")
{ {
if(word == "Vertices") if(word == "Vertices")
@ -508,24 +506,21 @@ bool build_triangulation_from_file(std::istream& is,
} }
} }
if (verbose)
{
std::cout << points.size() << " points" << std::endl; std::cout << points.size() << " points" << std::endl;
std::cout << border_facets.size() << " border facets" << std::endl; std::cout << border_facets.size() << " border facets" << std::endl;
std::cout << finite_cells.size() << " cells" << std::endl; std::cout << finite_cells.size() << " cells" << std::endl;
}
if(finite_cells.empty()) if(finite_cells.empty())
return false; return false;
bool is_well_built = build_triangulation(tr, return build_triangulation(tr,
points, finite_cells, border_facets, false, replace_domain_0); points, finite_cells, border_facets,
return is_well_built; verbose, replace_domain_0);
} }
template<class Tr>
bool build_triangulation_from_file(std::istream& is,
Tr& tr)
{
return build_triangulation_from_file(is, tr, false);
}
} // namespace MDS_3 } // namespace MDS_3
} // namespace CGAL } // namespace CGAL