diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
| commit | 6a8f01b2d30abda7e6184d9a4eb21460ae36d7d2 (patch) | |
| tree | 8349679953459a9141624fe8aaa3577f580e9cae /src/Persistent_cohomology/example/alpha_shapes_persistence.cpp | |
| parent | aa82d3856abe9e7b009c2c5bfa01540b82e17fdd (diff) | |
| parent | 059c906152ca90608238bc82b07d8e28e18218dc (diff) | |
Merged latest trunk changes to my_branch and fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/TDA_dev_1.1.0@409 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2463ee9b0f8b69e3edbda4e8189eb61606e0af93
Diffstat (limited to 'src/Persistent_cohomology/example/alpha_shapes_persistence.cpp')
| -rw-r--r-- | src/Persistent_cohomology/example/alpha_shapes_persistence.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Persistent_cohomology/example/alpha_shapes_persistence.cpp b/src/Persistent_cohomology/example/alpha_shapes_persistence.cpp index a88a9df0..0591a0ca 100644 --- a/src/Persistent_cohomology/example/alpha_shapes_persistence.cpp +++ b/src/Persistent_cohomology/example/alpha_shapes_persistence.cpp @@ -45,7 +45,7 @@ typedef CGAL::Delaunay_triangulation_3<Kernel,Tds> Triangulation_3; typedef CGAL::Alpha_shape_3<Triangulation_3> Alpha_shape_3; // From file type definition -typedef Kernel::Point_3 Point; +typedef Kernel::Point_3 Point_3; // filtration with alpha values needed type definition typedef Alpha_shape_3::FT Alpha_value_type; @@ -56,7 +56,7 @@ typedef CGAL::Dispatch_output_iterator< > > Dispatch; typedef Alpha_shape_3::Cell_handle Cell_handle; typedef Alpha_shape_3::Facet Facet; -typedef Alpha_shape_3::Edge Edge; +typedef Alpha_shape_3::Edge Edge_3; typedef std::list<Alpha_shape_3::Vertex_handle> Vertex_list; // gudhi type definition @@ -94,7 +94,7 @@ Vertex_list from (const Facet& fct) } return the_list; } -Vertex_list from (const Edge& edg) +Vertex_list from (const Edge_3& edg) { Vertex_list the_list; for (auto i = 0; i < 4; i++) @@ -151,14 +151,14 @@ int main (int argc, char * const argv[]) // Read points from file std::string filegraph = argv[1]; - std::list<Point> lp; + std::list<Point_3> lp; std::ifstream is(filegraph.c_str()); int n; is >> n; #ifdef DEBUG_TRACES std::cout << "Reading " << n << " points " << std::endl; #endif // DEBUG_TRACES - Point p; + Point_3 p; for( ; n>0 ; n--) { is >> p; lp.push_back(p); @@ -212,12 +212,12 @@ int main (int argc, char * const argv[]) dim_max=2; // Facet is of dim 2 } } - else if (const Edge* edge = CGAL::object_cast<Edge>(&object_iterator)) + else if (const Edge_3* edge = CGAL::object_cast<Edge_3>(&object_iterator)) { vertex_list = from(*edge); count_edges++; if (dim_max < 1) { - dim_max=1; // Edge is of dim 1 + dim_max=1; // Edge_3 is of dim 1 } } else if (const Alpha_shape_3::Vertex_handle* vertex = CGAL::object_cast<Alpha_shape_3::Vertex_handle>(&object_iterator)) |