diff options
Diffstat (limited to 'data/points/generator')
| -rw-r--r-- | data/points/generator/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | data/points/generator/hypergenerator.cpp | 16 |
2 files changed, 18 insertions, 24 deletions
diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt index f559610c..9a7f7bce 100644 --- a/data/points/generator/CMakeLists.txt +++ b/data/points/generator/CMakeLists.txt @@ -1,18 +1,14 @@ cmake_minimum_required(VERSION 2.6) project(Data_points_generator) -if(CGAL_FOUND) - if (NOT CGAL_VERSION VERSION_LESS 4.6.0) - if (EIGEN3_FOUND) - add_executable ( hypergenerator hypergenerator.cpp ) - target_link_libraries(hypergenerator ${Boost_SYSTEM_LIBRARY}) - add_test(hypergenerator_on_sphere_3000_10_5.0 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 3000 10 5.0) - add_test(hypergenerator_on_sphere_10000_3 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 10000 3) - add_test(hypergenerator_in_sphere_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in sphere inSphere.off 7000 12 10.8) - add_test(hypergenerator_in_sphere_50000_2 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in sphere inSphere.off 50000 2) - # on cube is not available in CGAL - add_test(hypergenerator_in_cube_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 7000 12 10.8) - add_test(hypergenerator_in_cube_50000_2 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 50000 3) - endif(EIGEN3_FOUND) - endif(NOT CGAL_VERSION VERSION_LESS 4.6.0) -endif(CGAL_FOUND) +if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0) + add_executable ( hypergenerator hypergenerator.cpp ) + target_link_libraries(hypergenerator ${Boost_SYSTEM_LIBRARY}) + add_test(hypergenerator_on_sphere_3000_10_5.0 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 3000 10 5.0) + add_test(hypergenerator_on_sphere_10000_3 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator on sphere onSphere.off 10000 3) + add_test(hypergenerator_in_sphere_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in sphere inSphere.off 7000 12 10.8) + add_test(hypergenerator_in_sphere_50000_2 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in sphere inSphere.off 50000 2) + # on cube is not available in CGAL + add_test(hypergenerator_in_cube_7000_12_10.8 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 7000 12 10.8) + add_test(hypergenerator_in_cube_50000_2 ${CMAKE_CURRENT_BINARY_DIR}/hypergenerator in cube inCube.off 50000 3) +endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0) diff --git a/data/points/generator/hypergenerator.cpp b/data/points/generator/hypergenerator.cpp index 60890b44..5831de18 100644 --- a/data/points/generator/hypergenerator.cpp +++ b/data/points/generator/hypergenerator.cpp @@ -29,7 +29,7 @@ #include <iterator> #include <vector> #include <fstream> // for std::ofstream - +#include <cstdlib> typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > K; typedef K::Point_d Point; @@ -47,24 +47,22 @@ int main(int argc, char **argv) { usage(argv[0]); } - int points_number = 0; - int returnedScanValue = sscanf(argv[4], "%d", &points_number); - if ((returnedScanValue == EOF) || (points_number <= 0)) { + int points_number = atoi(argv[4]); + if (points_number <= 0) { std::cerr << "Error: " << argv[4] << " is not correct" << std::endl; usage(argv[0]); } - int dimension = 0; - returnedScanValue = sscanf(argv[5], "%d", &dimension); - if ((returnedScanValue == EOF) || (dimension <= 0)) { + int dimension = atoi(argv[5]); + if (dimension <= 0) { std::cerr << "Error: " << argv[5] << " is not correct" << std::endl; usage(argv[0]); } double radius = 1.0; if (argc == 7) { - returnedScanValue = sscanf(argv[6], "%lf", &radius); - if ((returnedScanValue == EOF) || (radius <= 0.0)) { + radius = atof(argv[6]); + if (radius <= 0.0) { std::cerr << "Error: " << argv[6] << " is not correct" << std::endl; usage(argv[0]); } |