extra manual fixes

This commit is contained in:
Sébastien Loriot 2021-10-04 11:10:36 +02:00
parent 6dad5b6922
commit efbd86df7f
11 changed files with 13 additions and 13 deletions

View File

@ -20,7 +20,7 @@ int main(int argc, char* argv[])
{ {
//read in mesh //read in mesh
Surface_mesh sm; Surface_mesh sm;
const char* filename = (argc > 1) ? argv[1] : "./data/rectangle_with_degenerate_faces.off"; const char* filename = (argc > 1) ? argv[1] : "data/rectangle_with_degenerate_faces.off";
std::ifstream in(filename); std::ifstream in(filename);
in >> sm; in >> sm;
//property map for the distance values to the source set //property map for the distance values to the source set

View File

@ -24,7 +24,7 @@ namespace PMP = CGAL::Polygon_mesh_processing;
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
const char* filename1 = (argc > 1) ? argv[1] : CGAL::data_file_path("meshes/P.off"); const std::string filename1 = (argc > 1) ? argv[1] : CGAL::data_file_path("meshes/P.off");
Surface_mesh mesh1; Surface_mesh mesh1;
Polyhedron mesh2; Polyhedron mesh2;

View File

@ -83,7 +83,7 @@ int test_self_intersections(const std::string filename,
} }
template <typename K> template <typename K>
int test_limited_self_intersections(const char* filename) int test_limited_self_intersections(const std::string& filename)
{ {
typedef CGAL::Surface_mesh<typename K::Point_3> Mesh; typedef CGAL::Surface_mesh<typename K::Point_3> Mesh;
typedef typename boost::graph_traits<Mesh>::face_descriptor face_descriptor; typedef typename boost::graph_traits<Mesh>::face_descriptor face_descriptor;

View File

@ -49,10 +49,10 @@ if(EIGEN3_FOUND)
file(GLOB proto_misc_src "${RANSAC_PROTO_DIR}/MiscLib/*.cpp") file(GLOB proto_misc_src "${RANSAC_PROTO_DIR}/MiscLib/*.cpp")
add_library(libproto STATIC ${proto_src} ${proto_misc_src}) add_library(libproto STATIC ${proto_src} ${proto_misc_src})
add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp") add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp")
target_link_libraries(test_validity_sampled_data libproto CGAL::CGAL CGAL::Eigen3_support) target_link_libraries(test_validity_sampled_data libproto CGAL::CGAL CGAL::Data CGAL::Eigen3_support)
else() else()
add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp") add_executable(test_validity_sampled_data "test_validity_sampled_data.cpp")
target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Eigen3_support) target_link_libraries(test_validity_sampled_data CGAL::CGAL CGAL::Data CGAL::Eigen3_support)
endif() endif()
cgal_add_test(test_validity_sampled_data) cgal_add_test(test_validity_sampled_data)
endif() endif()

View File

@ -112,7 +112,7 @@ int main(int argc, char* argv[])
} }
Mesh P, Q; Mesh P, Q;
if(!CGAL::IO::read_polygon_mesh(P_name, P) || !CGAL::IO::read_polygon_mesh(Q_name], Q)) if(!CGAL::IO::read_polygon_mesh(P_name, P) || !CGAL::IO::read_polygon_mesh(Q_name, Q))
{ {
std::cerr << "Invalid input files." << std::endl; std::cerr << "Invalid input files." << std::endl;
return EXIT_FAILURE; return EXIT_FAILURE;

View File

@ -81,7 +81,7 @@ int main(int argc, char** argv)
{ {
bool draw=(argc>1?std::string(argv[1])=="-draw":false); bool draw=(argc>1?std::string(argv[1])=="-draw":false);
LCC_3_cmap lcc; LCC_3_cmap lcc;
if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off"))) if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off").c_str()))
{ {
std::cout<<"ERROR reading file data/double-torus.off"<<std::endl; std::cout<<"ERROR reading file data/double-torus.off"<<std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

View File

@ -59,7 +59,7 @@ int main(int argc, char** argv)
{ {
bool draw=(argc>1?std::string(argv[1])=="-draw":false); bool draw=(argc>1?std::string(argv[1])=="-draw":false);
LCC_3_cmap lcc; LCC_3_cmap lcc;
if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off"))) if (!CGAL::load_off(lcc, CGAL::data_file_path("meshes/double-torus-example.off").c_str()))
{ {
std::cout<<"ERROR reading file data/double-torus.off"<<std::endl; std::cout<<"ERROR reading file data/double-torus.off"<<std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

View File

@ -8,7 +8,7 @@
#include <fstream> #include <fstream>
template <typename Kernel> template <typename Kernel>
void create_triangulation(const char* filename) void create_triangulation(const std::string& filename)
{ {
typedef typename Kernel::FT FT; typedef typename Kernel::FT FT;
@ -59,7 +59,7 @@ int main(int argc, char** argv)
// and thus a separation mechanism is needed to ensure that no points are hidden // and thus a separation mechanism is needed to ensure that no points are hidden
typedef CGAL::Exact_predicates_inexact_constructions_kernel EPICK; typedef CGAL::Exact_predicates_inexact_constructions_kernel EPICK;
const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz"); const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz");
create_triangulation<EPICK>(filename); create_triangulation<EPICK>(filename);
create_triangulation<EPECK_w_SQRT>(filename); create_triangulation<EPECK_w_SQRT>(filename);

View File

@ -25,7 +25,7 @@ int main(int argc, char** argv)
{ {
std::cout.precision(17); std::cout.precision(17);
const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz"); const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/poste_france.xyz");
Traits traits(Point_3(0, 0, 0), 100); Traits traits(Point_3(0, 0, 0), 100);

View File

@ -17,7 +17,7 @@ int main(int argc, char** argv)
{ {
std::cout.precision(17); std::cout.precision(17);
const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz"); const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz");
std::vector<Point> points; std::vector<Point> points;
double x, y, z; double x, y, z;

View File

@ -34,7 +34,7 @@ typedef CGAL::Voronoi_diagram_2<DToS2, AT, AP> VD;
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
const char* filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz"); const std::string filename = (argc > 1) ? argv[1] : CGAL::data_file_path("points_3/radar.xyz");
const double radius = (argc > 2) ? std::stod(argv[2]) : 1; const double radius = (argc > 2) ? std::stod(argv[2]) : 1;
const double step = (argc > 3) ? std::stod(argv[3]) : 0.01; const double step = (argc > 3) ? std::stod(argv[3]) : 0.01;