Rename and reorganize point generators module

4 files changed, 11 insertions, 9 deletions

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 87f10a1a..bcdd0741 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -46,7 +46,7 @@ if(PYTHONINTERP_FOUND)
     set(GUDHI_PYTHON_MODULES "${GUDHI_PYTHON_MODULES}'bottleneck', ")
     set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'hera', ")
     set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'clustering', ")
-    set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'random_point_generators', ")
+    set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'datasets/generators', ")
   endif()
   if(CYTHON_FOUND)
     set(GUDHI_PYTHON_MODULES "${GUDHI_PYTHON_MODULES}'off_reader', ")
@@ -152,7 +152,7 @@ if(PYTHONINTERP_FOUND)
     set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'hera/wasserstein', ")
     set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'hera/bottleneck', ")
     if (NOT CGAL_VERSION VERSION_LESS 4.11.0)
-      set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'random_point_generators', ")
+      set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'datasets/generators/sphere', ")
       set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'bottleneck', ")
       set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'nerve_gic', ")
     endif ()
@@ -264,6 +264,8 @@ if(PYTHONINTERP_FOUND)
     file(COPY "gudhi/weighted_rips_complex.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi")
     file(COPY "gudhi/dtm_rips_complex.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi")
     file(COPY "gudhi/hera/__init__.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi/hera")
+    file(COPY "gudhi/datasets/generators/__init__.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi/datasets/generators")
+
 
     # Some files for pip package
     file(COPY "introduction.rst" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/")
@@ -427,10 +429,10 @@ if(PYTHONINTERP_FOUND)
                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
                ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_points_example.py")
-      add_test(NAME alpha_complex_from_generated_points_example_py_test
+      add_test(NAME alpha_complex_from_generated_points_on_sphere_example_py_test
                WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
                COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
-               ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_generated_points_example.py")
+               ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/example/alpha_complex_from_generated_points_on_sphere_example.py")
       add_test(NAME alpha_complex_diagram_persistence_from_off_file_example_py_test
              WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
              COMMAND ${CMAKE_COMMAND} -E env "${GUDHI_PYTHON_PATH_ENV}"
diff --git a/src/python/example/alpha_complex_from_generated_points_example.py b/src/python/example/alpha_complex_from_generated_points_on_sphere_example.py
index c2562d8a..2de9ec08 100644
--- a/src/python/example/alpha_complex_from_generated_points_example.py
+++ b/src/python/example/alpha_complex_from_generated_points_on_sphere_example.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from gudhi import random_point_generators
+from gudhi.datasets.generators import sphere
 from gudhi import AlphaComplex
 
 
@@ -19,11 +19,11 @@ __copyright__ = "Copyright (C) 2021 Inria"
 __license__ = "MIT"
 
 print("#####################################################################")
-print("AlphaComplex creation from generated points")
+print("AlphaComplex creation from generated points on sphere")
 
 
 # Generate a circle: 50 points; dim 2; radius 1
-points = random_point_generators.generate_points_on_sphere_d(50, 2, 1)
+points = sphere.generate_random_points(50, 2, 1)
 
 # Create an alpha complex
 alpha_complex = AlphaComplex(points=points)
diff --git a/src/python/gudhi/datasets/generators/__init__.py b/src/python/gudhi/datasets/generators/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/src/python/gudhi/datasets/generators/__init__.py
diff --git a/src/python/gudhi/random_point_generators.cc b/src/python/gudhi/datasets/generators/sphere.cc
index 6eb40429..79392ef0 100644
--- a/src/python/gudhi/random_point_generators.cc
+++ b/src/python/gudhi/datasets/generators/sphere.cc
@@ -42,9 +42,9 @@ py::array_t<double> generate_points_on_sphere(size_t num_points, int dim, double
     return points;
 }
 
-PYBIND11_MODULE(random_point_generators, m) {
+PYBIND11_MODULE(sphere, m) {
       m.attr("__license__") = "LGPL v3";
-      m.def("generate_points_on_sphere_d", &generate_points_on_sphere,
+      m.def("generate_random_points", &generate_points_on_sphere,
           py::arg("num_points"), py::arg("dim"), py::arg("radius") = 1,
           R"pbdoc(
     Generate random i.i.d. points uniformly on a (d-1)-sphere in R^d