diff options
author | Hind Montassif <hind.montassif@gmail.com> | 2021-05-07 15:30:08 +0200 |
---|---|---|
committer | Hind Montassif <hind.montassif@gmail.com> | 2021-05-07 15:30:08 +0200 |
commit | a1497289e6808d247f3b2be69b97dc9053e2b4d1 (patch) | |
tree | 9e228dc6ecb4260705d1b59938005d280626b4fe /src/python/gudhi/datasets/generators/points/torus.py | |
parent | 5c140bbdae08561ce69f0cc05841eb1467aa8eab (diff) |
Replace num_points with n_samples to be consistent with sphere
Diffstat (limited to 'src/python/gudhi/datasets/generators/points/torus.py')
-rw-r--r-- | src/python/gudhi/datasets/generators/points/torus.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/python/gudhi/datasets/generators/points/torus.py b/src/python/gudhi/datasets/generators/points/torus.py index 5a2b9016..1df0a930 100644 --- a/src/python/gudhi/datasets/generators/points/torus.py +++ b/src/python/gudhi/datasets/generators/points/torus.py @@ -10,33 +10,33 @@ import numpy as np import itertools -def generate_random_points(num_points, dim): +def generate_random_points(n_samples, dim): - # Generate random angles of size num_points*dim - alpha = 2*np.pi*np.random.rand(num_points*dim) + # Generate random angles of size n_samples*dim + alpha = 2*np.pi*np.random.rand(n_samples*dim) - # Based on angles, construct points of size num_points*dim on a circle and reshape the result in a num_points*2*dim array + # Based on angles, construct points of size n_samples*dim on a circle and reshape the result in a n_samples*2*dim array array_points = np.column_stack([np.cos(alpha), np.sin(alpha)]).reshape(-1, 2*dim) return array_points -def generate_grid_points(num_points, dim): +def generate_grid_points(n_samples, dim): - num_points_grid = int(num_points**(1./dim)) - alpha = np.linspace(0, 2*np.pi, num_points_grid, endpoint=False) + n_samples_grid = int(n_samples**(1./dim)) + alpha = np.linspace(0, 2*np.pi, n_samples_grid, endpoint=False) array_points_inter = np.column_stack([np.cos(alpha), np.sin(alpha)]) array_points = np.array(list(itertools.product(array_points_inter, repeat=dim))).reshape(-1, 2*dim) return array_points -def generate_points(num_points, dim, sample='random'): +def generate_points(n_samples, dim, sample='random'): if sample == 'random': print("Sample is random") - generate_random_points(num_points, dim) + generate_random_points(n_samples, dim) elif sample == 'grid': print("Sample is grid") - generate_grid_points(num_points, dim) + generate_grid_points(n_samples, dim) else: print("Sample type '{}' is not supported".format(sample)) return |