Merged latest trunk changes to Nerve_GIC

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/Nerve_GIC@2431 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: 866ddfadee8160dfaa46b8d703fd8d8d4476892a

3 files changed, 16 insertions, 13 deletions

diff --git a/data/points/SO3.COPYRIGHT b/data/points/SO3.COPYRIGHT
index 26bbb0ad..a9383f8f 100644
--- a/data/points/SO3.COPYRIGHT
+++ b/data/points/SO3.COPYRIGHT
@@ -7,3 +7,5 @@ This software is an implementation of the two following papers:
 J. C. Mitchell. Discrete Uniform Sampling of Rotation Groups Using Orthogonal Images. SIAM Journal of Scientific Computing, 30(1):525-547, 2007. 
 
 A. Yershova, S. Jain, S. M. LaValle, and J. C. Mitchell. Generating Uniform Incremental Grids on SO(3) Using the Hopf Fibration International Journal of Robotics Research, November 2009. 
+
+This software copyright is GNU General Public License as published by the Free Software Foundation version 2.
diff --git a/data/points/generator/CMakeLists.txt b/data/points/generator/CMakeLists.txt
index 9a7f7bce..88d377a7 100644
--- a/data/points/generator/CMakeLists.txt
+++ b/data/points/generator/CMakeLists.txt
@@ -1,14 +1,15 @@
 cmake_minimum_required(VERSION 2.6)
-project(Data_points_generator)
+project(data_points_generator)
 
 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)
+  add_executable ( data_points_generator hypergenerator.cpp )
+  target_link_libraries(data_points_generator ${Boost_SYSTEM_LIBRARY})
+  add_test(NAME data_points_generator_on_sphere_1000_3_15.2 COMMAND $<TARGET_FILE:data_points_generator>
+      "on" "sphere" "onSphere.off" "1000" "3" "15.2")
+  add_test(NAME data_points_generator_in_sphere_100_2 COMMAND $<TARGET_FILE:data_points_generator>
+      "in" "sphere" "inSphere.off" "100" "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)
+  add_test(NAME data_points_generator_in_cube_10000_3_5.8 COMMAND $<TARGET_FILE:data_points_generator>
+      "in" "cube" "inCube.off" "10000" "3" "5.8")
 endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.6.0)
diff --git a/data/points/generator/README b/data/points/generator/README
index 41cb9165..951bcfe1 100644
--- a/data/points/generator/README
+++ b/data/points/generator/README
@@ -7,21 +7,21 @@ cmake .
 cd /path-to-data-generator/
 make
 
-=========================== hypergenerator =====================================
+======================= data_points_generator ==================================
 
 Example of use :
 
 *** Hyper sphere|cube generator
 
-./hypergenerator on sphere onSphere.off 1000 3 15.2
+./data_points_generator on sphere onSphere.off 1000 3 15.2
 
  => generates a onSphere.off file with 1000 points randomized on a sphere of dimension 3 and radius 15.2
 
-./hypergenerator in sphere inSphere.off 100 2
+./data_points_generator in sphere inSphere.off 100 2
 
  => generates a inSphere.off file with 100 points randomized in a sphere of dimension 2 (circle) and radius 1.0 (default)
 
-./hypergenerator in cube inCube.off 10000 3 5.8
+./data_points_generator in cube inCube.off 10000 3 5.8
 
  => generates a inCube.off file with 10000 points randomized in a cube of dimension 3 and side 5.8