Rename function of torus cpp version and import it with sphere in points

Change documentation accordingly

1 files changed, 7 insertions, 8 deletions

diff --git a/src/python/test/test_datasets_generators.py b/src/python/test/test_datasets_generators.py
index 656c30ee..4c087c57 100755
--- a/src/python/test/test_datasets_generators.py
+++ b/src/python/test/test_datasets_generators.py
@@ -9,25 +9,24 @@
 """
 
 from gudhi.datasets.generators import points
-from gudhi.datasets.generators import _points
 
 import pytest
 
 def test_sphere():
-    assert _points.sphere(n_samples = 10, ambient_dim = 2, radius = 1., sample = 'random').shape == (10, 2)
+    assert points.sphere(n_samples = 10, ambient_dim = 2, radius = 1., sample = 'random').shape == (10, 2)
 
     with pytest.raises(ValueError):
-        _points.sphere(n_samples = 10, ambient_dim = 2, radius = 1., sample = 'other')
+        points.sphere(n_samples = 10, ambient_dim = 2, radius = 1., sample = 'other')
 
 def test_torus():
-    assert _points.torus(n_samples = 64, dim = 3, sample = 'random').shape == (64, 6)
-    assert _points.torus(n_samples = 64, dim = 3, sample = 'grid').shape == (64, 6)
+    assert points.ctorus(n_samples = 64, dim = 3, sample = 'random').shape == (64, 6)
+    assert points.ctorus(n_samples = 64, dim = 3, sample = 'grid').shape == (64, 6)
     
-    assert _points.torus(n_samples = 10, dim = 4, sample = 'random').shape == (10, 8)
-    assert _points.torus(n_samples = 10, dim = 4, sample = 'grid').shape == (1, 8)
+    assert points.ctorus(n_samples = 10, dim = 4, sample = 'random').shape == (10, 8)
+    assert points.ctorus(n_samples = 10, dim = 4, sample = 'grid').shape == (1, 8)
 
     with pytest.raises(ValueError):
-        _points.torus(n_samples = 10, dim = 4, sample = 'other')
+        points.ctorus(n_samples = 10, dim = 4, sample = 'other')
 
 def test_torus_full_python():
     assert points.torus(n_samples = 64, dim = 3, sample = 'random').shape == (64, 6)