From 61107c15d72cd9e4bb2c98b87998fdb91c065ddb Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 28 May 2015 11:04:18 +0200 Subject: [PATCH] improve the example in Ridges.txt (that is nothing that gets compiled) --- Ridges_3/doc/Ridges_3/Ridges_3.txt | 35 ++++++++++++++---------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/Ridges_3/doc/Ridges_3/Ridges_3.txt b/Ridges_3/doc/Ridges_3/Ridges_3.txt index d59d45a3e95..4f94bc953aa 100644 --- a/Ridges_3/doc/Ridges_3/Ridges_3.txt +++ b/Ridges_3/doc/Ridges_3/Ridges_3.txt @@ -444,15 +444,12 @@ typedef boost::graph_traits::vertex_descriptor vertex_descripto typedef boost::graph_traits::vertex_iterator vertex_iterator; typedef boost::graph_traits::face_descriptor face_descriptor; -typedef map VertexFT_map; +typedef std::map VertexFT_map; typedef boost::associative_property_map< VertexFT_map > VertexFT_property_map; -typedef map VertexVector_map; +typedef std::map VertexVector_map; typedef boost::associative_property_map< VertexVector_map > VertexVector_property_map; -typedef map Face2Vector_map; -typedef boost::associative_property_map< Face2Vector_map > Face2Vector_property_map; - //RIDGES typedef CGAL::Ridge_line Ridge_line; typedef CGAL::Ridge_approximation Umbilic_approximation; //create property maps -VertexFT_map vertex2k1_map, vertex2k2_map, - vertex2b0_map, vertex2b3_map, - vertex2P1_map, vertex2P2_map; - VertexVector_map vertex2d1_map, vertex2d2_map; +VertexFT_map vertex_k1_map, vertex_k2_map, + vertex_b0_map, vertex_b3_map, + vertex_P1_map, vertex_P2_map; + VertexVector_map vertex_d1_map, vertex_d2_map; -VertexFT_property_map vertex2k1_pm(vertex2k1_map), vertex2k2_pm(vertex2k2_map), - vertex2b0_pm(vertex2b0_map), vertex2b3_pm(vertex2b3_map), - vertex2P1_pm(vertex2P1_map), vertex2P2_pm(vertex2P2_map); - VertexVector_property_map vertex2d1_pm(vertex2d1_map), vertex2d2_pm(vertex2d2_map); +VertexFT_property_map vertex_k1_pm(vertex_k1_map), vertex_k2_pm(vertex_k2_map), + vertex_b0_pm(vertex_b0_map), vertex_b3_pm(vertex_b3_map), + vertex_P1_pm(vertex_P1_map), vertex_P2_pm(vertex_P2_map); + VertexVector_property_map vertex_d1_pm(vertex_d1_map), vertex_d2_pm(vertex_d2_map); int main(int argc, char *argv[]) { @@ -485,10 +482,10 @@ int main(int argc, char *argv[]) //Ridges //-------------------------------------------------------------------------- Ridge_approximation ridge_approximation(P, - vertex2k1_pm, vertex2k2_pm, - vertex2b0_pm, vertex2b3_pm, - vertex2P1_pm, vertex2P2_pm, - vertex2d1_pm, vertex2d2_pm); + vertex_k1_pm, vertex_k2_pm, + vertex_b0_pm, vertex_b3_pm, + vertex_P1_pm, vertex_P2_pm, + vertex_d1_pm, vertex_d2_pm); std::vector ridge_lines; std::back_insert_iterator > ii(ridge_lines); @@ -501,8 +498,8 @@ int main(int argc, char *argv[]) // UMBILICS //-------------------------------------------------------------------------- Umbilic_approximation umbilic_approximation(P, - vertex2k1_pm, vertex2k2_pm, - vertex2d1_pm, vertex2d2_pm); + vertex_k1_pm, vertex_k2_pm, + vertex_d1_pm, vertex_d2_pm); std::vector umbilics; std::back_insert_iterator > umb_it(umbilics); umbilic_approximation.compute(umb_it, umb_size);