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

Wrap the class inside namespace Surface_mesh_topology

This commit is contained in:
Thien Hoang 2019-07-05 22:46:23 +07:00
parent 0202f2eeca
commit 49c2b5f854
6 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Surface_mesh_topology/examples/Surface_mesh_topology/edgewidth_surface_mesh.cpp
View File

@ -20,7 +20,7 @@ private:
Mesh m_mesh;
};
using SNC = CGAL::Shortest_noncontractible_cycle<Mesh, Weight_functor>;
using SNC = CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<Mesh, Weight_functor>;
int main(int argc, char* argv[]) {
std::cout << "Program edgewidth_surface_mesh started.\n";

2
Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle_through_a_vertex.cpp
View File

@ -39,7 +39,7 @@ private:
const LCC_3& m_lcc;
};
using SNC = CGAL::Shortest_noncontractible_cycle<LCC_3, Weight_functor>;
using SNC = CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_3, Weight_functor>;
LCC_3 lcc;

2
Surface_mesh_topology/examples/Surface_mesh_topology/shortest_noncontractible_cycle_using_BFS.cpp
View File

@ -11,7 +11,7 @@
using LCC_3 = CGAL::Linear_cell_complex_for_combinatorial_map<2, 3>;
using size_type = LCC_3::size_type;
using SNC = CGAL::Shortest_noncontractible_cycle<LCC_3>;
using SNC = CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_3>;
LCC_3 lcc;

4
Surface_mesh_topology/examples/Surface_mesh_topology/unsew_edgewidth_repeatedly.cpp
View File

@ -28,9 +28,7 @@ private:
const LCC_3& m_lcc;
};
// using SNC = CGAL::Shortest_noncontractible_cycle<LCC_3>;
using SNC = CGAL::Shortest_noncontractible_cycle<LCC_3, Weight_functor>;
using SNC = CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_3, Weight_functor>;
struct Draw_functor : public CGAL::DefaultDrawingFunctorLCC {
Draw_functor(LCC_3::size_type am1, LCC_3::size_type am2) : is_root(am1),

2
Surface_mesh_topology/include/CGAL/Shortest_noncontractible_cycle.h
View File

@ -8,6 +8,7 @@
#include <CGAL/Linear_cell_complex_for_combinatorial_map.h>
namespace CGAL {
namespace Surface_mesh_topology {
template <class GeneralizedMap, class WeightFunctor = void>
class Shortest_noncontractible_cycle {
@ -482,6 +483,7 @@ private:
std::vector<int> m_trace_index;
};
}
}
#endif

25
Surface_mesh_topology/test/Surface_mesh_topology/shortest_noncontractible_cycle_tests.cpp
View File

@ -81,8 +81,8 @@ bool find_cycle_in_unweighted_cmap_and_polyhedron() {
std::cerr << "Fail find_cycle_in_unweighted_cmap_and_polyhedron: Cannot locate file data/3torus.off\n";
return false;
}
CGAL::Shortest_noncontractible_cycle<LCC_for_CMap_2> snc1(lcc);
CGAL::Shortest_noncontractible_cycle<LCC_for_CMap_2>::Path cycle1;
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_for_CMap_2> snc1(lcc);
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_for_CMap_2>::Path cycle1;
unsigned int cycle_length1;
LCC_for_CMap_2::Dart_handle root1 = lcc.darts().begin();
Point R = lcc.point_of_vertex_attribute(lcc.vertex_attribute(root1));
@ -101,8 +101,8 @@ bool find_cycle_in_unweighted_cmap_and_polyhedron() {
std::cerr << "Fail find_cycle_in_unweighted_cmap_and_polyhedron: Cannot locate file data/3torus.off\n";
return false;
}
CGAL::Shortest_noncontractible_cycle<Polyhedron> snc2(p);
CGAL::Shortest_noncontractible_cycle<Polyhedron>::Path cycle2;
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<Polyhedron> snc2(p);
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<Polyhedron>::Path cycle2;
unsigned int cycle_length2;
boost::graph_traits<Polyhedron>::halfedge_iterator root2 = p.halfedges_begin(), endit = p.halfedges_end();
for (; root2 != endit; ++root2) {
@ -135,8 +135,8 @@ bool edge_width_in_unweighted_polyhedron() {
std::cerr << "Fail edge_width_in_unweighted_polyhedron: Cannot locate file data/3torus.off\n";
return false;
}
CGAL::Shortest_noncontractible_cycle<Polyhedron> snc(p);
CGAL::Shortest_noncontractible_cycle<Polyhedron>::Path cycle;
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<Polyhedron> snc(p);
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<Polyhedron>::Path cycle;
unsigned int cycle_length;
snc.edge_width(cycle, &cycle_length);
if (cycle.size() != cycle_length) {
@ -166,9 +166,9 @@ bool edge_width_in_weighted_cmap_gmap_mesh() {
Weight_functor_for_LCC<LCC_for_CMap_2> wf_cm(lcc_cm);
Weight_functor_for_LCC<LCC_for_GMap_2> wf_gm(lcc_gm);
Weight_functor_for_SM wf_sm(sm);
typedef CGAL::Shortest_noncontractible_cycle<LCC_for_CMap_2, Weight_functor_for_LCC<LCC_for_CMap_2> > SNC_1;
typedef CGAL::Shortest_noncontractible_cycle<LCC_for_GMap_2, Weight_functor_for_LCC<LCC_for_GMap_2> > SNC_2;
typedef CGAL::Shortest_noncontractible_cycle<Surface_mesh, Weight_functor_for_SM> SNC_3;
typedef CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_for_CMap_2, Weight_functor_for_LCC<LCC_for_CMap_2> > SNC_1;
typedef CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_for_GMap_2, Weight_functor_for_LCC<LCC_for_GMap_2> > SNC_2;
typedef CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<Surface_mesh, Weight_functor_for_SM> SNC_3;
SNC_1 snc1(lcc_cm, wf_cm);
SNC_2 snc2(lcc_gm, wf_gm);
SNC_3 snc3(sm, wf_sm);
@ -212,8 +212,8 @@ bool unsew_edge_width_repeatedly_in_unweighted_gmap() {
std::vector<unsigned int> cycle_lengths;
unsigned int length;
do {
CGAL::Shortest_noncontractible_cycle<LCC_for_GMap_2> snc(lcc_gm);
CGAL::Shortest_noncontractible_cycle<LCC_for_GMap_2>::Path cycle;
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_for_GMap_2> snc(lcc_gm);
CGAL::Surface_mesh_topology::Shortest_noncontractible_cycle<LCC_for_GMap_2>::Path cycle;
snc.edge_width(cycle, &length);
for (auto e : cycle) {
if (e == NULL) {
@ -237,7 +237,8 @@ int main() {
edge_width_in_unweighted_polyhedron() &&
find_cycle_in_unweighted_gmap() &&
edge_width_in_weighted_cmap_gmap_mesh() &&
unsew_edge_width_repeatedly_in_unweighted_gmap()) {
unsew_edge_width_repeatedly_in_unweighted_gmap())
{
std::cout << "All tests passed\n";
return EXIT_SUCCESS;
} else return EXIT_FAILURE;