From 3bbae2e625ee99b5d6d4eab7c06acfa1246ad3ea Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 11 Apr 2017 08:10:47 +0000 Subject: Move Euclidean_distance in Gudhi namespace Fix cpplints git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2331 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bc5609c2df490db50e82b56a5e6d899dc6370182 --- src/Persistent_cohomology/benchmark/performance_rips_persistence.cpp | 2 +- src/Persistent_cohomology/example/rips_multifield_persistence.cpp | 2 +- src/Persistent_cohomology/example/rips_persistence.cpp | 2 +- src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp | 2 +- .../example/rips_persistence_via_boundary_matrix.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Persistent_cohomology') diff --git a/src/Persistent_cohomology/benchmark/performance_rips_persistence.cpp b/src/Persistent_cohomology/benchmark/performance_rips_persistence.cpp index ba752999..252e8aef 100644 --- a/src/Persistent_cohomology/benchmark/performance_rips_persistence.cpp +++ b/src/Persistent_cohomology/benchmark/performance_rips_persistence.cpp @@ -83,7 +83,7 @@ int main(int argc, char * argv[]) { // Compute the proximity graph of the points start = std::chrono::system_clock::now(); - Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Euclidean_distance()); + Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Gudhi::Euclidean_distance()); end = std::chrono::system_clock::now(); elapsed_sec = std::chrono::duration_cast(end - start).count(); std::cout << "Compute Rips graph in " << elapsed_sec << " ms.\n"; diff --git a/src/Persistent_cohomology/example/rips_multifield_persistence.cpp b/src/Persistent_cohomology/example/rips_multifield_persistence.cpp index 7674b5a5..dae36ed2 100644 --- a/src/Persistent_cohomology/example/rips_multifield_persistence.cpp +++ b/src/Persistent_cohomology/example/rips_multifield_persistence.cpp @@ -62,7 +62,7 @@ int main(int argc, char * argv[]) { program_options(argc, argv, off_file_points, filediag, threshold, dim_max, min_p, max_p, min_persistence); Points_off_reader off_reader(off_file_points); - Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Euclidean_distance()); + Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Gudhi::Euclidean_distance()); // Construct the Rips complex in a Simplex Tree Simplex_tree simplex_tree; diff --git a/src/Persistent_cohomology/example/rips_persistence.cpp b/src/Persistent_cohomology/example/rips_persistence.cpp index c6378de7..d504798b 100644 --- a/src/Persistent_cohomology/example/rips_persistence.cpp +++ b/src/Persistent_cohomology/example/rips_persistence.cpp @@ -60,7 +60,7 @@ int main(int argc, char * argv[]) { program_options(argc, argv, off_file_points, filediag, threshold, dim_max, p, min_persistence); Points_off_reader off_reader(off_file_points); - Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Euclidean_distance()); + Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Gudhi::Euclidean_distance()); // Construct the Rips complex in a Simplex Tree Simplex_tree simplex_tree; diff --git a/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp b/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp index b159c62e..554eeba6 100644 --- a/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp +++ b/src/Persistent_cohomology/example/rips_persistence_step_by_step.cpp @@ -82,7 +82,7 @@ int main(int argc, char * argv[]) { // Compute the proximity graph of the points Graph_t prox_graph = compute_proximity_graph(off_reader.get_point_cloud(), threshold - , Euclidean_distance()); + , Gudhi::Euclidean_distance()); // Construct the Rips complex in a Simplex Tree Simplex_tree st; diff --git a/src/Persistent_cohomology/example/rips_persistence_via_boundary_matrix.cpp b/src/Persistent_cohomology/example/rips_persistence_via_boundary_matrix.cpp index 63da9847..9618f278 100644 --- a/src/Persistent_cohomology/example/rips_persistence_via_boundary_matrix.cpp +++ b/src/Persistent_cohomology/example/rips_persistence_via_boundary_matrix.cpp @@ -70,7 +70,7 @@ int main(int argc, char * argv[]) { program_options(argc, argv, off_file_points, filediag, threshold, dim_max, p, min_persistence); Points_off_reader off_reader(off_file_points); - Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Euclidean_distance()); + Rips_complex rips_complex_from_file(off_reader.get_point_cloud(), threshold, Gudhi::Euclidean_distance()); // Construct the Rips complex in a Simplex Tree Simplex_tree& st = *new Simplex_tree; -- cgit v1.2.3 From 4a4453471d00a2df72533b5bd7dbfbee398f4e57 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 11 Apr 2017 09:02:54 +0000 Subject: Fix some #include "" git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@2332 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2c15320d156c2b928e9eb664a2afed8fa9809e7e --- src/Persistent_cohomology/test/betti_numbers_unit_test.cpp | 4 ++-- .../test/persistent_cohomology_unit_test.cpp | 8 ++++---- .../test/persistent_cohomology_unit_test_multi_field.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'src/Persistent_cohomology') diff --git a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp index 0ed3fddf..da418034 100644 --- a/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp +++ b/src/Persistent_cohomology/test/betti_numbers_unit_test.cpp @@ -9,8 +9,8 @@ #define BOOST_TEST_MODULE "betti_numbers" #include -#include "gudhi/Simplex_tree.h" -#include "gudhi/Persistent_cohomology.h" +#include +#include struct MiniSTOptions : Gudhi::Simplex_tree_options_full_featured { // Implicitly use 0 as filtration value for all simplices diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp index 6efd749e..e2e0bc71 100644 --- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp +++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test.cpp @@ -10,10 +10,10 @@ #define BOOST_TEST_MODULE "persistent_cohomology" #include -#include "gudhi/graph_simplicial_complex.h" -#include "gudhi/reader_utils.h" -#include "gudhi/Simplex_tree.h" -#include "gudhi/Persistent_cohomology.h" +#include +#include +#include +#include using namespace Gudhi; using namespace Gudhi::persistent_cohomology; diff --git a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp index 1a6e3296..6a7ecbec 100644 --- a/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp +++ b/src/Persistent_cohomology/test/persistent_cohomology_unit_test_multi_field.cpp @@ -9,11 +9,11 @@ #define BOOST_TEST_MODULE "persistent_cohomology_multi_field" #include -#include "gudhi/graph_simplicial_complex.h" -#include "gudhi/reader_utils.h" -#include "gudhi/Simplex_tree.h" -#include "gudhi/Persistent_cohomology.h" -#include "gudhi/Persistent_cohomology/Multi_field.h" +#include +#include +#include +#include +#include using namespace Gudhi; using namespace Gudhi::persistent_cohomology; -- cgit v1.2.3