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

Cancel useless changes in BGL and Surface_mesh

This commit is contained in:
Simon Giraudot 2017-01-04 08:47:32 +01:00
parent 1beb340550
commit ab7a245161
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/examples/BGL_surface_mesh/connected_components.cpp
View File

@ -18,7 +18,7 @@ int main(int argc, char* argv[])
std::ifstream in((argc>1)?argv[1]:"data/prim.off"); std::ifstream in((argc>1)?argv[1]:"data/prim.off");
in >> sm; in >> sm;
CGAL::Properties::Property_map<vertex_descriptor,int> ccmap; Mesh::Property_map<vertex_descriptor,int> ccmap;
ccmap = sm.add_property_map<vertex_descriptor,int>("v:CC").first; ccmap = sm.add_property_map<vertex_descriptor,int>("v:CC").first;
int num = connected_components(sm, ccmap); int num = connected_components(sm, ccmap);

2
BGL/examples/BGL_surface_mesh/prim.cpp
View File

@ -19,7 +19,7 @@ int main(int, char* argv[])
//std::cin >> P; //std::cin >> P;
std::ifstream in(argv[1]); std::ifstream in(argv[1]);
in >> P; in >> P;
CGAL::Properties::Property_map<vertex_descriptor,vertex_descriptor> predecessor; Mesh::Property_map<vertex_descriptor,vertex_descriptor> predecessor;
predecessor = P.add_property_map<vertex_descriptor,vertex_descriptor>("v:predecessor").first; predecessor = P.add_property_map<vertex_descriptor,vertex_descriptor>("v:predecessor").first;
boost::prim_minimum_spanning_tree(P, predecessor, boost::root_vertex(*vertices(P).first)); boost::prim_minimum_spanning_tree(P, predecessor, boost::root_vertex(*vertices(P).first));

4
BGL/examples/BGL_surface_mesh/surface_mesh_dual.cpp
View File

@ -68,7 +68,7 @@ int main(int argc, char* argv[])
} }
// the storage of a property map is in primal // the storage of a property map is in primal
CGAL::Properties::Property_map<face_descriptor,int> fccmap; Mesh::Property_map<face_descriptor,int> fccmap;
fccmap = primal.add_property_map<face_descriptor,int>("f:CC").first; fccmap = primal.add_property_map<face_descriptor,int>("f:CC").first;
int num = connected_components(finite_dual, fccmap); int num = connected_components(finite_dual, fccmap);
@ -77,7 +77,7 @@ int main(int argc, char* argv[])
std::cout << f << " in connected component " << fccmap[f] << std::endl; std::cout << f << " in connected component " << fccmap[f] << std::endl;
} }
CGAL::Properties::Property_map<vertex_descriptor,int> vccmap; Mesh::Property_map<vertex_descriptor,int> vccmap;
vccmap = primal.add_property_map<vertex_descriptor,int>("v:CC").first; vccmap = primal.add_property_map<vertex_descriptor,int>("v:CC").first;
num = connected_components(primal, vccmap); num = connected_components(primal, vccmap);

2
Surface_mesh/examples/Surface_mesh/sm_bgl.cpp
View File

@ -21,7 +21,7 @@ int main(int /* argc */, char* argv[])
Mesh sm; Mesh sm;
std::ifstream in(argv[1]); std::ifstream in(argv[1]);
in >> sm; in >> sm;
CGAL::Properties::Property_map<vertex_descriptor,vertex_descriptor> predecessor; Mesh::Property_map<vertex_descriptor,vertex_descriptor> predecessor;
predecessor = sm.add_property_map<vertex_descriptor,vertex_descriptor>("v:predecessor").first; predecessor = sm.add_property_map<vertex_descriptor,vertex_descriptor>("v:predecessor").first;
boost::prim_minimum_spanning_tree(sm, predecessor, boost::root_vertex(*vertices(sm).first)); boost::prim_minimum_spanning_tree(sm, predecessor, boost::root_vertex(*vertices(sm).first));

2
Surface_mesh/examples/Surface_mesh/sm_join.cpp
View File

@ -19,7 +19,7 @@ int main(int argc, char* argv[])
std::ifstream in2((argc>2)?argv[2]:"data/quad.off"); std::ifstream in2((argc>2)?argv[2]:"data/quad.off");
CGAL::Properties::Property_map<vertex_descriptor,std::string> name1, name2; Mesh::Property_map<vertex_descriptor,std::string> name1, name2;
bool created; bool created;
sm1.add_property_map<vertex_descriptor,int>("v:weight",7812); sm1.add_property_map<vertex_descriptor,int>("v:weight",7812);
boost::tie(name1, created) = sm1.add_property_map<vertex_descriptor,std::string>("v:name","hello"); boost::tie(name1, created) = sm1.add_property_map<vertex_descriptor,std::string>("v:name","hello");

2
Surface_mesh/examples/Surface_mesh/sm_memory.cpp
View File

@ -31,7 +31,7 @@ int main()
} }
// The status of being used or removed is stored in a property map // The status of being used or removed is stored in a property map
CGAL::Properties::Property_map<Mesh::Vertex_index,bool> removed Mesh::Property_map<Mesh::Vertex_index,bool> removed
= m.property_map<Mesh::Vertex_index,bool>("v:removed").first; = m.property_map<Mesh::Vertex_index,bool>("v:removed").first;

8
Surface_mesh/examples/Surface_mesh/sm_properties.cpp
View File

@ -26,7 +26,7 @@ int main()
// give each vertex a name, the default is empty // give each vertex a name, the default is empty
CGAL::Properties::Property_map<vertex_descriptor,std::string> name; Mesh::Property_map<vertex_descriptor,std::string> name;
bool created; bool created;
boost::tie(name, created) = m.add_property_map<vertex_descriptor,std::string>("v:name",""); boost::tie(name, created) = m.add_property_map<vertex_descriptor,std::string>("v:name","");
assert(created); assert(created);
@ -36,20 +36,20 @@ int main()
{ {
// You get an existing property, and created will be false // You get an existing property, and created will be false
CGAL::Properties::Property_map<vertex_descriptor,std::string> name; Mesh::Property_map<vertex_descriptor,std::string> name;
bool created; bool created;
boost::tie(name, created) = m.add_property_map<vertex_descriptor,std::string>("v:name", ""); boost::tie(name, created) = m.add_property_map<vertex_descriptor,std::string>("v:name", "");
assert(! created); assert(! created);
} }
// You can't get a property that does not exist // You can't get a property that does not exist
CGAL::Properties::Property_map<face_descriptor,std::string> gnus; Mesh::Property_map<face_descriptor,std::string> gnus;
bool found; bool found;
boost::tie(gnus, found) = m.property_map<face_descriptor,std::string>("v:gnus"); boost::tie(gnus, found) = m.property_map<face_descriptor,std::string>("v:gnus");
assert(! found); assert(! found);
// retrieve the point property for which exists a convenience function // retrieve the point property for which exists a convenience function
CGAL::Properties::Property_map<vertex_descriptor, K::Point_3> location = m.points(); Mesh::Property_map<vertex_descriptor, K::Point_3> location = m.points();
BOOST_FOREACH( vertex_descriptor vd, m.vertices()) { BOOST_FOREACH( vertex_descriptor vd, m.vertices()) {
std::cout << name[vd] << " @ " << location[vd] << std::endl; std::cout << name[vd] << " @ " << location[vd] << std::endl;
} }