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

Partial fixes to make it work (unfinished)

This commit is contained in:
Fernando Cacciola 2006-10-19 16:50:06 +00:00
parent 21b500ee70
commit 2725260334
2 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
BGL/examples/BGL_polyhedron_3/kruskal.cpp
View File

@ -1,7 +1,9 @@
#include <CGAL/Cartesian.h> #include <CGAL/Cartesian.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>
#include <CGAL/IO/Polyhedron_iostream.h> #include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/graph_traits_Polyhedron_3.h> #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <CGAL/Unique_hash_map.h>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
@ -15,18 +17,29 @@ typedef Kernel::Vector_3 Vector;
typedef Kernel::Point_3 Point; typedef Kernel::Point_3 Point;
typedef CGAL::Polyhedron_3<Kernel> Polyhedron; typedef CGAL::Polyhedron_3<Kernel> Polyhedron;
typedef boost::graph_traits<Polyhedron>::vertex_descriptor vertex_descriptor; typedef boost::graph_traits<Polyhedron const>::vertex_descriptor vertex_const_descriptor;
typedef boost::graph_traits<Polyhedron>::vertex_iterator vertex_iterator; typedef boost::graph_traits<Polyhedron const>::vertex_iterator vertex_const_iterator;
typedef boost::graph_traits<Polyhedron>::edge_descriptor edge_descriptor; typedef boost::graph_traits<Polyhedron const>::edge_descriptor edge_const_descriptor;
// The BGL makes heavy use of indices associated to the vertices // The BGL makes heavy use of indices associated to the vertices
// We use a std::map to store the index // We use a std::map to store the index
typedef std::map<vertex_descriptor,int> VertexIndexMap;
namespace CGAL
{
// (but we define operator < for handles as is not predefined)
bool operator< ( vertex_const_descriptor const& x, vertex_const_descriptor const& y )
{
return &*x < &*y ;
}
}
typedef std::map<vertex_const_descriptor,int> VertexIndexMap;
VertexIndexMap vertex_id_map; VertexIndexMap vertex_id_map;
// A std::map is not a property map, because it is not lightweight // A std::map is not a property map, because it is not lightweight
typedef boost::associative_property_map<VertexIndexMap> VertexIdPropertyMap; typedef boost::const_associative_property_map<VertexIndexMap> VertexIdPropertyMap;
VertexIdPropertyMap vertex_index_pmap(vertex_id_map); VertexIdPropertyMap vertex_index_pmap(vertex_id_map);
@ -35,13 +48,13 @@ kruskal(const Polyhedron& P)
{ {
// associate indices to the vertices // associate indices to the vertices
{ {
vertex_iterator vb, ve; vertex_const_iterator vb, ve;
int index = 0; int index = 0;
// boost::tie assigns the first and second element of the std::pair // boost::tie assigns the first and second element of the std::pair
// returned by boost::vertices to the variables vit and ve // returned by boost::vertices to the variables vit and ve
for(boost::tie(vb,ve)=boost::vertices(P); vb!=ve; ++vb ){ for(boost::tie(vb,ve)=boost::vertices(P); vb!=ve; ++vb ){
vertex_descriptor vd = *vb; vertex_const_descriptor vd = *vb;
vertex_id_map[vd]= index++; vertex_id_map[vd]= index++;
} }
} }
@ -50,12 +63,12 @@ kruskal(const Polyhedron& P)
// This property map is defined in graph_traits_Polyhedron_3.h // This property map is defined in graph_traits_Polyhedron_3.h
// In the function call you can see a named parameter: vertex_index_map // In the function call you can see a named parameter: vertex_index_map
std::list<edge_descriptor> mst; std::list<edge_const_descriptor> mst;
boost::kruskal_minimum_spanning_tree(P, boost::kruskal_minimum_spanning_tree(P,
std::back_inserter(mst), std::back_inserter(mst),
vertex_index_map(vertex_index_pmap)); vertex_index_map(vertex_index_pmap));
vertex_iterator vb, ve; vertex_const_iterator vb, ve;
std::cout << "#VRML V2.0 utf8\n" std::cout << "#VRML V2.0 utf8\n"
"Shape {\n" "Shape {\n"
@ -74,9 +87,12 @@ kruskal(const Polyhedron& P)
"}\n" "}\n"
"coordIndex [\n"; "coordIndex [\n";
for(std::list<edge_descriptor>::iterator it = mst.begin(); it != mst.end(); ++it){ for(std::list<edge_const_descriptor>::iterator it = mst.begin(); it != mst.end(); ++it)
std::cout << vertex_id_map[boost::source(*it,P)] {
<< ", " << vertex_id_map[boost::target(*it,P)] << ", -1\n"; edge_const_descriptor e = *it ;
vertex_const_descriptor s = boost::source(e,P);
vertex_const_descriptor t = boost::target(e,P);
std::cout << vertex_id_map[s] << ", " << vertex_id_map[t] << ", -1\n";
} }
std::cout << "]\n" std::cout << "]\n"

29
BGL/examples/BGL_polyhedron_3/kruskal_with_stored_id.cpp
View File

@ -2,7 +2,8 @@
#include <CGAL/Polyhedron_3.h> #include <CGAL/Polyhedron_3.h>
#include <CGAL/Polyhedron_items_with_id_3.h> #include <CGAL/Polyhedron_items_with_id_3.h>
#include <CGAL/IO/Polyhedron_iostream.h> #include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/graph_traits_Polyhedron_3.h> #include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/boost/graph/properties_Polyhedron_3.h>
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
@ -11,14 +12,14 @@
#include <boost/graph/kruskal_min_spanning_tree.hpp> #include <boost/graph/kruskal_min_spanning_tree.hpp>
typedef CGAL::Cartesian<double> Kernel; typedef CGAL::Cartesian<double> Kernel;
typedef Kernel::Vector_3 Vector; typedef Kernel::Vector_3 Vector;
typedef Kernel::Point_3 Point; typedef Kernel::Point_3 Point;
typedef CGAL::Polyhedron_3<Kernel,Polyhedron_items_with_id_3> Polyhedron; typedef CGAL::Polyhedron_3<Kernel,CGAL::Polyhedron_items_with_id_3> Polyhedron;
typedef boost::graph_traits<Polyhedron>::vertex_descriptor vertex_descriptor; typedef boost::graph_traits<Polyhedron>::vertex_descriptor vertex_const_descriptor;
typedef boost::graph_traits<Polyhedron>::vertex_iterator vertex_iterator; typedef boost::graph_traits<Polyhedron>::vertex_iterator vertex_const_iterator;
typedef boost::graph_traits<Polyhedron>::edge_descriptor edge_descriptor; typedef boost::graph_traits<Polyhedron>::edge_descriptor edge_const_descriptor;
void void
@ -26,13 +27,13 @@ kruskal(const Polyhedron& P)
{ {
// associate indices to the vertices using the "id()" field of the vertex. // associate indices to the vertices using the "id()" field of the vertex.
{ {
vertex_iterator vb, ve; vertex_const_iterator vb, ve;
int index = 0; int index = 0;
// boost::tie assigns the first and second element of the std::pair // boost::tie assigns the first and second element of the std::pair
// returned by boost::vertices to the variables vit and ve // returned by boost::vertices to the variables vit and ve
for(boost::tie(vb,ve)=boost::vertices(P); vb!=ve; ++vb ){ for(boost::tie(vb,ve)=boost::vertices(P); vb!=ve; ++vb ){
vertex_descriptor vd = *vb; vertex_const_descriptor vd = *vb;
vd->id() = index++; vd->id() = index++;
} }
} }
@ -44,10 +45,10 @@ kruskal(const Polyhedron& P)
// when ommitted defaults to "get(vertex_index,graph)". // when ommitted defaults to "get(vertex_index,graph)".
// That default works here because the vertex type supports the "id()" // That default works here because the vertex type supports the "id()"
// field which is used by the vertex_index internal property. // field which is used by the vertex_index internal property.
std::list<edge_descriptor> mst; std::list<edge_const_descriptor> mst;
boost::kruskal_minimum_spanning_tree(P,std::back_inserter(mst)); boost::kruskal_minimum_spanning_tree(P,std::back_inserter(mst));
vertex_iterator vb, ve; vertex_const_iterator vb, ve;
std::cout << "#VRML V2.0 utf8\n" std::cout << "#VRML V2.0 utf8\n"
"Shape {\n" "Shape {\n"
@ -66,8 +67,8 @@ kruskal(const Polyhedron& P)
"}\n" "}\n"
"coordIndex [\n"; "coordIndex [\n";
for(std::list<edge_descriptor>::iterator it = mst.begin(); it != mst.end(); ++it){ for(std::list<edge_const_descriptor>::iterator it = mst.begin(); it != mst.end(); ++it){
std::cout << vertex_id_map[boost::source(*it,P)] std::cout << boost::source(*it,P)->id()
<< ", " << boost::target(*it,P)->id() << ", -1\n"; << ", " << boost::target(*it,P)->id() << ", -1\n";
} }