summaryrefslogtreecommitdiff
path: root/src/python/gudhi
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2020-04-11 18:18:14 +0200
committerMarc Glisse <marc.glisse@inria.fr>2020-04-11 18:18:14 +0200
commitf9a933862050ca95b3a96d7a8572d62f7f2205a9 (patch)
tree65b1a3df0d67ea0323942cbf4bc15e6371665793 /src/python/gudhi
parent0a404547afec2e43dd5edf9410ff079d156d691a (diff)
Use longer names
Diffstat (limited to 'src/python/gudhi')
-rw-r--r--src/python/gudhi/point_cloud/dtm.py10
-rw-r--r--src/python/gudhi/point_cloud/knn.py2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/python/gudhi/point_cloud/dtm.py b/src/python/gudhi/point_cloud/dtm.py
index 23c36b88..38368f29 100644
--- a/src/python/gudhi/point_cloud/dtm.py
+++ b/src/python/gudhi/point_cloud/dtm.py
@@ -7,10 +7,10 @@
# Modification(s):
# - YYYY/MM Author: Description of the modification
-from .knn import KNN
+from .knn import KNearestNeighbors
-class DTM:
+class DistanceToMeasure:
"""
Class to compute the distance to the empirical measure defined by a point set, as introduced in :cite:`dtm`.
"""
@@ -20,7 +20,7 @@ class DTM:
Args:
k (int): number of neighbors (possibly including the point itself).
q (float): order used to compute the distance to measure. Defaults to 2.
- kwargs: same parameters as :class:`~gudhi.point_cloud.knn.KNN`, except that metric="neighbors" means that :func:`transform` expects an array with the distances to the k nearest neighbors.
+ kwargs: same parameters as :class:`~gudhi.point_cloud.knn.KNearestNeighbors`, except that metric="neighbors" means that :func:`transform` expects an array with the distances to the k nearest neighbors.
"""
self.k = k
self.q = q
@@ -35,7 +35,9 @@ class DTM:
X (numpy.array): coordinates for mass points.
"""
if self.params.setdefault("metric", "euclidean") != "neighbors":
- self.knn = KNN(self.k, return_index=False, return_distance=True, sort_results=False, **self.params)
+ self.knn = KNearestNeighbors(
+ self.k, return_index=False, return_distance=True, sort_results=False, **self.params
+ )
self.knn.fit(X)
return self
diff --git a/src/python/gudhi/point_cloud/knn.py b/src/python/gudhi/point_cloud/knn.py
index 8369f1f8..6642a3c2 100644
--- a/src/python/gudhi/point_cloud/knn.py
+++ b/src/python/gudhi/point_cloud/knn.py
@@ -10,7 +10,7 @@
import numpy
-class KNN:
+class KNearestNeighbors:
"""
Class wrapping several implementations for computing the k nearest neighbors in a point set.
"""