From 7865ef2cc4abd972b2ba1eb50790912820fa2ee2 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 25 Sep 2018 16:05:33 +0000 Subject: clang-format all files Add safe version alpha complex 3d persistence utility git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alpha_complex_3d_module_vincent@3907 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 54b2d0de9231511864df9fa637b60b7ccf34f50f --- .../benchmark/Alpha_complex_3d_benchmark.cpp | 208 +++++++++++---------- 1 file changed, 110 insertions(+), 98 deletions(-) (limited to 'src/Alpha_complex/benchmark/Alpha_complex_3d_benchmark.cpp') diff --git a/src/Alpha_complex/benchmark/Alpha_complex_3d_benchmark.cpp b/src/Alpha_complex/benchmark/Alpha_complex_3d_benchmark.cpp index 3e556cdf..1a33f2b4 100644 --- a/src/Alpha_complex/benchmark/Alpha_complex_3d_benchmark.cpp +++ b/src/Alpha_complex/benchmark/Alpha_complex_3d_benchmark.cpp @@ -18,92 +18,100 @@ std::ofstream results_csv("results.csv"); template -void benchmark_points_on_torus_dD(const std::string& msg ) { +void benchmark_points_on_torus_dD(const std::string& msg) { std::cout << "+ " << msg << std::endl; results_csv << "\"" << msg << "\";" << std::endl; - results_csv << "\"nb_points\";" << "\"nb_simplices\";" << "\"alpha_creation_time(sec.)\";" << - "\"simplex_creation_time(sec.)\";" << std::endl; + results_csv << "\"nb_points\";" + << "\"nb_simplices\";" + << "\"alpha_creation_time(sec.)\";" + << "\"simplex_creation_time(sec.)\";" << std::endl; - using K = CGAL::Epick_d< CGAL::Dimension_tag<3> >; - for (int nb_points = 1000; nb_points <= 125000 ; nb_points *= 5) { + using K = CGAL::Epick_d>; + for (int nb_points = 1000; nb_points <= 125000; nb_points *= 5) { std::cout << " Alpha complex dD on torus with " << nb_points << " points." << std::endl; std::vector points_on_torus = Gudhi::generate_points_on_torus_3D(nb_points, 1.0, 0.5); std::vector points; - for(auto p:points_on_torus) { - points.push_back(typename Kernel::Point_d(p.begin(),p.end())); + for (auto p : points_on_torus) { + points.push_back(typename Kernel::Point_d(p.begin(), p.end())); } Gudhi::Clock ac_create_clock(" benchmark_points_on_torus_dD - Alpha complex 3d creation"); ac_create_clock.begin(); Gudhi::alpha_complex::Alpha_complex alpha_complex_from_points(points); - ac_create_clock.end(); std::cout << ac_create_clock; + ac_create_clock.end(); + std::cout << ac_create_clock; Gudhi::Simplex_tree<> simplex; Gudhi::Clock st_create_clock(" benchmark_points_on_torus_dD - simplex tree creation"); st_create_clock.begin(); alpha_complex_from_points.create_complex(simplex); - st_create_clock.end(); std::cout << st_create_clock; + st_create_clock.end(); + std::cout << st_create_clock; - results_csv << nb_points << ";" << simplex.num_simplices() << ";" << ac_create_clock.num_seconds() << ";" << - st_create_clock.num_seconds() << ";" << std::endl; + results_csv << nb_points << ";" << simplex.num_simplices() << ";" << ac_create_clock.num_seconds() << ";" + << st_create_clock.num_seconds() << ";" << std::endl; std::cout << " benchmark_points_on_torus_dD - nb simplices = " << simplex.num_simplices() << std::endl; } - } template -void benchmark_points_on_torus_3D(const std::string& msg ) { - using K = CGAL::Epick_d< CGAL::Dimension_tag<3> >; +void benchmark_points_on_torus_3D(const std::string& msg) { + using K = CGAL::Epick_d>; std::cout << "+ " << msg << std::endl; results_csv << "\"" << msg << "\";" << std::endl; - results_csv << "\"nb_points\";" << "\"nb_simplices\";" << "\"alpha_creation_time(sec.)\";" << - "\"simplex_creation_time(sec.)\";" << std::endl; + results_csv << "\"nb_points\";" + << "\"nb_simplices\";" + << "\"alpha_creation_time(sec.)\";" + << "\"simplex_creation_time(sec.)\";" << std::endl; - for (int nb_points = 1000; nb_points <= 125000 ; nb_points *= 5) { + for (int nb_points = 1000; nb_points <= 125000; nb_points *= 5) { std::cout << " Alpha complex 3d on torus with " << nb_points << " points." << std::endl; std::vector points_on_torus = Gudhi::generate_points_on_torus_3D(nb_points, 1.0, 0.5); std::vector points; - for(auto p:points_on_torus) { - points.push_back(typename Alpha_complex_3d::Point_3(p[0],p[1],p[2])); + for (auto p : points_on_torus) { + points.push_back(typename Alpha_complex_3d::Point_3(p[0], p[1], p[2])); } Gudhi::Clock ac_create_clock(" benchmark_points_on_torus_3D - Alpha complex 3d creation"); ac_create_clock.begin(); Alpha_complex_3d alpha_complex_from_points(points); - ac_create_clock.end(); std::cout << ac_create_clock; + ac_create_clock.end(); + std::cout << ac_create_clock; Gudhi::Simplex_tree<> simplex; Gudhi::Clock st_create_clock(" benchmark_points_on_torus_3D - simplex tree creation"); st_create_clock.begin(); alpha_complex_from_points.create_complex(simplex); - st_create_clock.end(); std::cout << st_create_clock; + st_create_clock.end(); + std::cout << st_create_clock; - results_csv << nb_points << ";" << simplex.num_simplices() << ";" << ac_create_clock.num_seconds() << ";" << - st_create_clock.num_seconds() << ";" << std::endl; + results_csv << nb_points << ";" << simplex.num_simplices() << ";" << ac_create_clock.num_seconds() << ";" + << st_create_clock.num_seconds() << ";" << std::endl; std::cout << " benchmark_points_on_torus_3D - nb simplices = " << simplex.num_simplices() << std::endl; } - } template -void benchmark_weighted_points_on_torus_3D(const std::string& msg ) { - using K = CGAL::Epick_d< CGAL::Dimension_tag<3> >; +void benchmark_weighted_points_on_torus_3D(const std::string& msg) { + using K = CGAL::Epick_d>; std::cout << "+ " << msg << std::endl; results_csv << "\"" << msg << "\";" << std::endl; - results_csv << "\"nb_points\";" << "\"nb_simplices\";" << "\"alpha_creation_time(sec.)\";" << - "\"simplex_creation_time(sec.)\";" << std::endl; + results_csv << "\"nb_points\";" + << "\"nb_simplices\";" + << "\"alpha_creation_time(sec.)\";" + << "\"simplex_creation_time(sec.)\";" << std::endl; CGAL::Random random(8); - for (int nb_points = 1000; nb_points <= 125000 ; nb_points *= 5) { + for (int nb_points = 1000; nb_points <= 125000; nb_points *= 5) { std::cout << " Alpha complex 3d on torus with " << nb_points << " points." << std::endl; std::vector points_on_torus = Gudhi::generate_points_on_torus_3D(nb_points, 1.0, 0.5); @@ -112,50 +120,52 @@ void benchmark_weighted_points_on_torus_3D(const std::string& msg ) { std::vector points; - for(auto p:points_on_torus) { - points.push_back(Weighted_point(Point(p[0],p[1],p[2]), 0.9 + random.get_double(0., 0.01))); + for (auto p : points_on_torus) { + points.push_back(Weighted_point(Point(p[0], p[1], p[2]), 0.9 + random.get_double(0., 0.01))); } Gudhi::Clock ac_create_clock(" benchmark_weighted_points_on_torus_3D - Alpha complex 3d creation"); ac_create_clock.begin(); Weighted_alpha_complex_3d alpha_complex_from_points(points); - ac_create_clock.end(); std::cout << ac_create_clock; + ac_create_clock.end(); + std::cout << ac_create_clock; Gudhi::Simplex_tree<> simplex; Gudhi::Clock st_create_clock(" benchmark_weighted_points_on_torus_3D - simplex tree creation"); st_create_clock.begin(); alpha_complex_from_points.create_complex(simplex); - st_create_clock.end(); std::cout << st_create_clock; + st_create_clock.end(); + std::cout << st_create_clock; - results_csv << nb_points << ";" << simplex.num_simplices() << ";" << ac_create_clock.num_seconds() << ";" << - st_create_clock.num_seconds() << ";" << std::endl; + results_csv << nb_points << ";" << simplex.num_simplices() << ";" << ac_create_clock.num_seconds() << ";" + << st_create_clock.num_seconds() << ";" << std::endl; std::cout << " benchmark_weighted_points_on_torus_3D - nb simplices = " << simplex.num_simplices() << std::endl; } - } template -void benchmark_periodic_points(const std::string& msg ) { +void benchmark_periodic_points(const std::string& msg) { std::cout << "+ " << msg << std::endl; results_csv << "\"" << msg << "\";" << std::endl; - results_csv << "\"nb_points\";" << "\"nb_simplices\";" << "\"alpha_creation_time(sec.)\";" << - "\"simplex_creation_time(sec.)\";" << std::endl; + results_csv << "\"nb_points\";" + << "\"nb_simplices\";" + << "\"alpha_creation_time(sec.)\";" + << "\"simplex_creation_time(sec.)\";" << std::endl; CGAL::Random random(8); - for (double nb_points = 10.; nb_points <= 40. ; nb_points += 10.) { - std::cout << " Periodic alpha complex 3d with " << nb_points*nb_points*nb_points << " points." << std::endl; + for (double nb_points = 10.; nb_points <= 40.; nb_points += 10.) { + std::cout << " Periodic alpha complex 3d with " << nb_points * nb_points * nb_points << " points." << std::endl; using Point = typename Periodic_alpha_complex_3d::Point_3; std::vector points; for (double i = 0; i < nb_points; i++) { for (double j = 0; j < nb_points; j++) { for (double k = 0; k < nb_points; k++) { - points.push_back(Point(i + random.get_double(0., 0.1), - j + random.get_double(0., 0.1), - k + random.get_double(0., 0.1))); + points.push_back( + Point(i + random.get_double(0., 0.1), j + random.get_double(0., 0.1), k + random.get_double(0., 0.1))); } } } @@ -163,34 +173,38 @@ void benchmark_periodic_points(const std::string& msg ) { Gudhi::Clock ac_create_clock(" benchmark_periodic_points - Alpha complex 3d creation"); ac_create_clock.begin(); Periodic_alpha_complex_3d alpha_complex_from_points(points, 0., 0., 0., nb_points, nb_points, nb_points); - ac_create_clock.end(); std::cout << ac_create_clock; + ac_create_clock.end(); + std::cout << ac_create_clock; Gudhi::Simplex_tree<> simplex; Gudhi::Clock st_create_clock(" benchmark_periodic_points - simplex tree creation"); st_create_clock.begin(); alpha_complex_from_points.create_complex(simplex); - st_create_clock.end(); std::cout << st_create_clock; + st_create_clock.end(); + std::cout << st_create_clock; - results_csv << nb_points*nb_points*nb_points << ";" << simplex.num_simplices() << ";" << - ac_create_clock.num_seconds() << ";" << st_create_clock.num_seconds() << ";" << std::endl; + results_csv << nb_points * nb_points * nb_points << ";" << simplex.num_simplices() << ";" + << ac_create_clock.num_seconds() << ";" << st_create_clock.num_seconds() << ";" << std::endl; std::cout << " benchmark_periodic_points - nb simplices = " << simplex.num_simplices() << std::endl; } - } template -void benchmark_weighted_periodic_points(const std::string& msg ) { +void benchmark_weighted_periodic_points(const std::string& msg) { std::cout << "+ " << msg << std::endl; results_csv << "\"" << msg << "\";" << std::endl; - results_csv << "\"nb_points\";" << "\"nb_simplices\";" << "\"alpha_creation_time(sec.)\";" << - "\"simplex_creation_time(sec.)\";" << std::endl; + results_csv << "\"nb_points\";" + << "\"nb_simplices\";" + << "\"alpha_creation_time(sec.)\";" + << "\"simplex_creation_time(sec.)\";" << std::endl; CGAL::Random random(8); - for (double nb_points = 10.; nb_points <= 40. ; nb_points += 10.) { - std::cout << " Weighted periodic alpha complex 3d with " << nb_points*nb_points*nb_points << " points." << std::endl; + for (double nb_points = 10.; nb_points <= 40.; nb_points += 10.) { + std::cout << " Weighted periodic alpha complex 3d with " << nb_points * nb_points * nb_points << " points." + << std::endl; using Point = typename Weighted_periodic_alpha_complex_3d::Point_3; using Weighted_point = typename Weighted_periodic_alpha_complex_3d::Triangulation_3::Weighted_point; @@ -199,10 +213,9 @@ void benchmark_weighted_periodic_points(const std::string& msg ) { for (double i = 0; i < nb_points; i++) { for (double j = 0; j < nb_points; j++) { for (double k = 0; k < nb_points; k++) { - points.push_back(Weighted_point(Point(i + random.get_double(0., 0.1), - j + random.get_double(0., 0.1), - k + random.get_double(0., 0.1)), - random.get_double(0., (nb_points*nb_points)/64.))); + points.push_back(Weighted_point( + Point(i + random.get_double(0., 0.1), j + random.get_double(0., 0.1), k + random.get_double(0., 0.1)), + random.get_double(0., (nb_points * nb_points) / 64.))); } } } @@ -210,57 +223,56 @@ void benchmark_weighted_periodic_points(const std::string& msg ) { Gudhi::Clock ac_create_clock(" benchmark_weighted_periodic_points - Alpha complex 3d creation"); ac_create_clock.begin(); Weighted_periodic_alpha_complex_3d alpha_complex_from_points(points, 0., 0., 0., nb_points, nb_points, nb_points); - ac_create_clock.end(); std::cout << ac_create_clock; + ac_create_clock.end(); + std::cout << ac_create_clock; Gudhi::Simplex_tree<> simplex; Gudhi::Clock st_create_clock(" benchmark_weighted_periodic_points - simplex tree creation"); st_create_clock.begin(); alpha_complex_from_points.create_complex(simplex); - st_create_clock.end(); std::cout << st_create_clock; + st_create_clock.end(); + std::cout << st_create_clock; - results_csv << nb_points*nb_points*nb_points << ";" << simplex.num_simplices() << ";" << - ac_create_clock.num_seconds() << ";" << st_create_clock.num_seconds() << ";" << std::endl; + results_csv << nb_points * nb_points * nb_points << ";" << simplex.num_simplices() << ";" + << ac_create_clock.num_seconds() << ";" << st_create_clock.num_seconds() << ";" << std::endl; std::cout << " benchmark_weighted_periodic_points - nb simplices = " << simplex.num_simplices() << std::endl; } - } -int main(int argc, char **argv) { - - benchmark_points_on_torus_dD >>("Fast static dimension version"); - benchmark_points_on_torus_dD>("Fast dynamic dimension version"); - benchmark_points_on_torus_dD >>("Exact static dimension version"); - benchmark_points_on_torus_dD>("Exact dynamic dimension version"); - - benchmark_points_on_torus_3D>("Fast version"); - benchmark_points_on_torus_3D>("Safe version"); - benchmark_points_on_torus_3D>("Exact version"); - - - benchmark_weighted_points_on_torus_3D>("Fast version"); - benchmark_weighted_points_on_torus_3D>("Safe version"); - benchmark_weighted_points_on_torus_3D>("Exact version"); - - benchmark_periodic_points>("Fast version"); - benchmark_periodic_points>("Safe version"); - benchmark_periodic_points>("Exact version"); - - benchmark_weighted_periodic_points>("Fast version"); - benchmark_weighted_periodic_points>("Safe version"); - benchmark_weighted_periodic_points>("Exact version"); +int main(int argc, char** argv) { + benchmark_points_on_torus_dD>>("Fast static dimension version"); + benchmark_points_on_torus_dD>("Fast dynamic dimension version"); + benchmark_points_on_torus_dD>>("Exact static dimension version"); + benchmark_points_on_torus_dD>("Exact dynamic dimension version"); + + benchmark_points_on_torus_3D< + Gudhi::alpha_complex::Alpha_complex_3d>("Fast version"); + benchmark_points_on_torus_3D< + Gudhi::alpha_complex::Alpha_complex_3d>("Safe version"); + benchmark_points_on_torus_3D< + Gudhi::alpha_complex::Alpha_complex_3d>("Exact version"); + + benchmark_weighted_points_on_torus_3D< + Gudhi::alpha_complex::Alpha_complex_3d>("Fast version"); + benchmark_weighted_points_on_torus_3D< + Gudhi::alpha_complex::Alpha_complex_3d>("Safe version"); + benchmark_weighted_points_on_torus_3D< + Gudhi::alpha_complex::Alpha_complex_3d>("Exact version"); + + benchmark_periodic_points< + Gudhi::alpha_complex::Alpha_complex_3d>("Fast version"); + benchmark_periodic_points< + Gudhi::alpha_complex::Alpha_complex_3d>("Safe version"); + benchmark_periodic_points< + Gudhi::alpha_complex::Alpha_complex_3d>("Exact version"); + + benchmark_weighted_periodic_points< + Gudhi::alpha_complex::Alpha_complex_3d>("Fast version"); + benchmark_weighted_periodic_points< + Gudhi::alpha_complex::Alpha_complex_3d>("Safe version"); + benchmark_weighted_periodic_points< + Gudhi::alpha_complex::Alpha_complex_3d>("Exact version"); return 0; } -- cgit v1.2.3