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

benchmark use Surface_mesh

This commit is contained in:
Lingjie Zhu 2018-10-07 20:01:06 +08:00
parent ae3986d4e5
commit c38fffcee1
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_autoinit_timing_benchmark.cpp
View File

@ -2,19 +2,17 @@
#include <fstream> #include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Variational_shape_approximation.h> #include <CGAL/Variational_shape_approximation.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef Kernel::FT FT; typedef Kernel::FT FT;
typedef CGAL::Polyhedron_3<Kernel> Polyhedron; typedef CGAL::Surface_mesh<Kernel::Point_3> Mesh;
typedef boost::property_map<Polyhedron, boost::vertex_point_t>::type Vertex_point_map; typedef boost::property_map<Mesh, boost::vertex_point_t>::type Vertex_point_map;
typedef CGAL::Variational_shape_approximation<Polyhedron, Vertex_point_map> L21_approx; typedef CGAL::Variational_shape_approximation<Mesh, Vertex_point_map> L21_approx;
typedef L21_approx::Error_metric L21_metric; typedef L21_approx::Error_metric L21_metric;
typedef CGAL::Timer Timer; typedef CGAL::Timer Timer;
@ -30,22 +28,22 @@ int main(int argc, char *argv[])
if (argc < 5) if (argc < 5)
return EXIT_FAILURE; return EXIT_FAILURE;
Polyhedron mesh; Mesh mesh;
std::ifstream input(argv[1]); std::ifstream input(argv[1]);
if (!input || !(input >> mesh) || mesh.empty()) { if (!input || !(input >> mesh) || !CGAL::is_triangle_mesh(mesh)) {
std::cout << "Invalid off file." << std::endl; std::cout << "Invalid input file." << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
std::cout << "#triangles " << mesh.size_of_facets() << std::endl; std::cout << "#faces "
<< std::distance(faces(mesh).first, faces(mesh).second) << std::endl;
Vertex_point_map vpmap = get(boost::vertex_point, const_cast<Mesh &>(mesh));
// error metric and fitting functors // error metric and fitting functors
L21_metric error_metric(mesh, L21_metric error_metric(mesh, vpmap);
get(boost::vertex_point, const_cast<Polyhedron &>(mesh)));
// algorithm instance // algorithm instance
L21_approx approx(mesh, L21_approx approx(mesh, vpmap, error_metric);
get(boost::vertex_point, const_cast<Polyhedron &>(mesh)),
error_metric);
int method = std::atoi(argv[2]); int method = std::atoi(argv[2]);
if (method < 0 || method > 2) if (method < 0 || method > 2)
@ -60,12 +58,12 @@ int main(int argc, char *argv[])
std::cout << "start seeding" << std::endl; std::cout << "start seeding" << std::endl;
t.start(); t.start();
approx.initialize_seeds( approx.initialize_seeds(
CGAL::parameters::seeding_method(static_cast<CGAL::VSA::Seeding_method>(method)) CGAL::parameters::seeding_method(static_cast<CGAL::Surface_mesh_approximation::Seeding_method>(method))
.min_error_drop(error_drop) .min_error_drop(error_drop)
.number_of_relaxations(number_of_relaxations)); .number_of_relaxations(number_of_relaxations));
t.stop(); t.stop();
std::cout << "seeding time " << t.time() << " sec." << std::endl; std::cout << "seeding time " << t.time() << " sec." << std::endl;
std::cout << "#proxies " << approx.proxies_size() << std::endl; std::cout << "#proxies " << approx.number_of_proxies() << std::endl;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

32
Surface_mesh_approximation/benchmark/Surface_mesh_approximation/vsa_timing_benchmark.cpp
View File

@ -2,18 +2,16 @@
#include <fstream> #include <fstream>
#include <CGAL/Exact_predicates_inexact_constructions_kernel.h> #include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
#include <CGAL/Polyhedron_3.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/IO/Polyhedron_iostream.h>
#include <CGAL/boost/graph/graph_traits_Polyhedron_3.h>
#include <CGAL/Variational_shape_approximation.h> #include <CGAL/Variational_shape_approximation.h>
#include <CGAL/Timer.h> #include <CGAL/Timer.h>
typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel; typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef CGAL::Polyhedron_3<Kernel> Polyhedron; typedef CGAL::Surface_mesh<Kernel::Point_3> Mesh;
typedef boost::property_map<Polyhedron, boost::vertex_point_t>::type Vertex_point_map; typedef boost::property_map<Mesh, boost::vertex_point_t>::type Vertex_point_map;
typedef CGAL::Variational_shape_approximation<Polyhedron, Vertex_point_map> L21_approx; typedef CGAL::Variational_shape_approximation<Mesh, Vertex_point_map> L21_approx;
typedef L21_approx::Error_metric L21_metric; typedef L21_approx::Error_metric L21_metric;
typedef CGAL::Timer Timer; typedef CGAL::Timer Timer;
@ -31,22 +29,22 @@ int main(int argc, char *argv[])
if (argc < 5) if (argc < 5)
return EXIT_FAILURE; return EXIT_FAILURE;
Polyhedron mesh; Mesh mesh;
std::ifstream input(argv[1]); std::ifstream input(argv[1]);
if (!input || !(input >> mesh) || mesh.empty()) { if (!input || !(input >> mesh) || !CGAL::is_triangle_mesh(mesh)) {
std::cout << "Invalid off file." << std::endl; std::cout << "Invalid input file." << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;
} }
std::cout << "#triangles " << mesh.size_of_facets() << std::endl; std::cout << "#faces "
<< std::distance(faces(mesh).first, faces(mesh).second) << std::endl;
Vertex_point_map vpmap = get(boost::vertex_point, const_cast<Mesh &>(mesh));
// error metric and fitting functors // error metric and fitting functors
L21_metric error_metric(mesh, L21_metric error_metric(mesh, vpmap);
get(boost::vertex_point, const_cast<Polyhedron &>(mesh)));
// algorithm instance // algorithm instance
L21_approx approx(mesh, L21_approx approx(mesh, vpmap, error_metric);
get(boost::vertex_point, const_cast<Polyhedron &>(mesh)),
error_metric);
int method = std::atoi(argv[2]); int method = std::atoi(argv[2]);
if (method < 0 || method > 2) if (method < 0 || method > 2)
@ -64,8 +62,8 @@ int main(int argc, char *argv[])
t0.reset(); t0.reset();
t0.start(); t0.start();
approx.initialize_seeds( approx.initialize_seeds(
CGAL::parameters::seeding_method(static_cast<CGAL::VSA::Seeding_method>(method)) CGAL::parameters::seeding_method(static_cast<CGAL::Surface_mesh_approximation::Seeding_method>(method))
.max_number_of_proxies(nb_proxies)); .max_number_of_proxies(nb_proxies));
t0.stop(); t0.stop();
std::cout << "seeding time " << t0.time() << " sec." << std::endl; std::cout << "seeding time " << t0.time() << " sec." << std::endl;