Add __init__.py files at every module level

Standardize functions to match the existing ones in sphere

5 files changed, 11 insertions, 11 deletions

diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index 1b9db2b5..e146fedc 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}'datasets/generators/points', ")
+    set(GUDHI_PYTHON_MODULES_EXTRA "${GUDHI_PYTHON_MODULES_EXTRA}'datasets', ")
   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}'datasets/generators/points/_torus', ")
+      set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'datasets/generators/_points', ")
       set(GUDHI_PYBIND11_MODULES "${GUDHI_PYBIND11_MODULES}'bottleneck', ")
       set(GUDHI_CYTHON_MODULES "${GUDHI_CYTHON_MODULES}'nerve_gic', ")
     endif ()
@@ -264,7 +264,7 @@ 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/points/" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi/datasets/generators/points/" FILES_MATCHING PATTERN "*.py")
+    file(COPY "gudhi/datasets" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/gudhi" FILES_MATCHING PATTERN "*.py")
 
 
     # Some files for pip package
diff --git a/src/python/gudhi/datasets/generators/points/__init__.py b/src/python/gudhi/datasets/__init__.py
index e69de29b..e69de29b 100644
--- a/src/python/gudhi/datasets/generators/points/__init__.py
+++ b/src/python/gudhi/datasets/__init__.py
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/datasets/generators/points/_torus.cc b/src/python/gudhi/datasets/generators/_points.cc
index f4b4f14e..561fd6d8 100644
--- a/src/python/gudhi/datasets/generators/points/_torus.cc
+++ b/src/python/gudhi/datasets/generators/_points.cc
@@ -47,9 +47,9 @@ py::array_t<double> generate_points_on_torus(size_t n_samples, int dim, bool uni
     return points;
 }
 
-PYBIND11_MODULE(_torus, m) {
+PYBIND11_MODULE(_points, m) {
       m.attr("__license__") = "LGPL v3";
-      m.def("generate_random_points", &generate_points_on_torus,
+      m.def("torus", &generate_points_on_torus,
           py::arg("n_samples"), py::arg("dim"), py::arg("uniform") = false,
           R"pbdoc(
     Generate random i.i.d. points on a d-torus in R^2d
diff --git a/src/python/gudhi/datasets/generators/points/torus.py b/src/python/gudhi/datasets/generators/points.py
index 1df0a930..d5a370ad 100644
--- a/src/python/gudhi/datasets/generators/points/torus.py
+++ b/src/python/gudhi/datasets/generators/points.py
@@ -10,7 +10,7 @@
 import numpy as np
 import itertools
 
-def generate_random_points(n_samples, dim):
+def _generate_random_points(n_samples, dim):
 
     # Generate random angles of size n_samples*dim
     alpha = 2*np.pi*np.random.rand(n_samples*dim)
@@ -20,7 +20,7 @@ def generate_random_points(n_samples, dim):
     
     return array_points
 
-def generate_grid_points(n_samples, dim):
+def _generate_grid_points(n_samples, dim):
     
     n_samples_grid = int(n_samples**(1./dim))
     alpha = np.linspace(0, 2*np.pi, n_samples_grid, endpoint=False)
@@ -30,13 +30,13 @@ def generate_grid_points(n_samples, dim):
     
     return array_points
 
-def generate_points(n_samples, dim, sample='random'):
+def torus(n_samples, dim, sample='random'):
     if sample == 'random':
         print("Sample is random")
-        generate_random_points(n_samples, dim)
+        return _generate_random_points(n_samples, dim)
     elif sample == 'grid':
         print("Sample is grid")
-        generate_grid_points(n_samples, dim)
+        return _generate_grid_points(n_samples, dim)
     else:
-        print("Sample type '{}' is not supported".format(sample))
+        raise Exception("Sample type '{}' is not supported".format(sample))
         return