summaryrefslogtreecommitdiff
path: root/src/python/gudhi/reader_utils.pyx
diff options
context:
space:
mode:
authorVincent Rouvreau <10407034+VincentRouvreau@users.noreply.github.com>2020-01-27 09:50:53 +0100
committerGitHub <noreply@github.com>2020-01-27 09:50:53 +0100
commitd2eac76e24031c1746e73e8703b0caafc66dc0a3 (patch)
tree9ef54033c497b85b0853393361f00b24c50b0846 /src/python/gudhi/reader_utils.pyx
parent1e061ddfe473aceb8727fc5ca160193bf9d9a4fc (diff)
parentf5e49792f809b198908a67e674672a676c0877ec (diff)
Merge pull request #189 from mglisse/doc
Link the doc for subsampling & point file readers, some reorg
Diffstat (limited to 'src/python/gudhi/reader_utils.pyx')
-rw-r--r--src/python/gudhi/reader_utils.pyx8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/python/gudhi/reader_utils.pyx b/src/python/gudhi/reader_utils.pyx
index d6033b86..fe1c3a2e 100644
--- a/src/python/gudhi/reader_utils.pyx
+++ b/src/python/gudhi/reader_utils.pyx
@@ -34,7 +34,7 @@ def read_lower_triangular_matrix_from_csv_file(csv_file='', separator=';'):
:type separator: char
:returns: The lower triangular matrix.
- :rtype: vector[vector[double]]
+ :rtype: List[List[float]]
"""
if csv_file:
if path.isfile(csv_file):
@@ -45,15 +45,15 @@ def read_lower_triangular_matrix_from_csv_file(csv_file='', separator=';'):
def read_persistence_intervals_grouped_by_dimension(persistence_file=''):
"""Reads a file containing persistence intervals.
Each line might contain 2, 3 or 4 values: [[field] dimension] birth death
- The return value is an `map[dim, vector[pair[birth, death]]]`
- where `dim` is an `int`, `birth` a `double`, and `death` a `double`.
+ The return value is a `dict(dim, list(tuple(birth, death)))`
+ where `dim` is an `int`, `birth` a `float`, and `death` a `float`.
Note: the function does not check that birth <= death.
:param persistence_file: A persistence file style name.
:type persistence_file: string
:returns: The persistence pairs grouped by dimension.
- :rtype: map[int, vector[pair[double, double]]]
+ :rtype: Dict[int, List[Tuple[float, float]]]
"""
if persistence_file:
if path.isfile(persistence_file):