summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-06-14 07:45:09 +0000
committercjamin <cjamin@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2017-06-14 07:45:09 +0000
commita6b6f91bfd5a86ee88297b27f18c2bc7d38f6db4 (patch)
treec2280b31b9f6ddba5d2863ed61a5ddd15a2f8338 /src
parente6b1730fd0832fad2a9103863428465155f70986 (diff)
Remove birth<=death check (should be done by the caller if necessary)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/read_persistence_from_file@2544 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: ce50159f4bf779a2a42d357cf1c2aa290feaf9b9
Diffstat (limited to 'src')
-rw-r--r--src/common/include/gudhi/reader_utils.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/include/gudhi/reader_utils.h b/src/common/include/gudhi/reader_utils.h
index 35af09bd..8df20dcc 100644
--- a/src/common/include/gudhi/reader_utils.h
+++ b/src/common/include/gudhi/reader_utils.h
@@ -305,6 +305,7 @@ Reads a file containing persistence intervals.
Each line might contain 2, 3 or 4 values: [[field] dimension] birth death
The output iterator `out` is used this way: `*out++ = std::make_tuple(dim, birth, death);`
where `dim` is an `int`, `birth` a `double`, and `death` a `double`.
+Note: the function does not check that birth <= death.
**/
template <typename OutputIterator>
void read_persistence_intervals_and_dimension(std::string const& filename, OutputIterator out) {
@@ -326,7 +327,6 @@ void read_persistence_intervals_and_dimension(std::string const& filename, Outpu
if (n >= 2) {
//int field = (n == 4 ? static_cast<int>(numbers[0]) : -1);
int dim = (n >= 3 ? static_cast<int>(numbers[n - 3]) : -1);
- GUDHI_CHECK(numbers[n - 2] <= numbers[n - 1], "Error: birth > death.");
*out++ = std::make_tuple(dim, numbers[n - 2], numbers[n - 1]);
}
}
@@ -338,6 +338,7 @@ Reads a file containing persistence intervals.
Each line might contain 2, 3 or 4 values: [[field] dimension] birth death
The return value is an `std::map<dim, std::vector<std::pair<birth, death>>>`
where `dim` is an `int`, `birth` a `double`, and `death` a `double`.
+Note: the function does not check that birth <= death.
**/
std::map<int, std::vector<std::pair<double, double>>> read_persistence_intervals_grouped_by_dimension(std::string const& filename) {
@@ -357,6 +358,7 @@ If `only_this_dim` is >= 0, only the lines where dimension = `only_this_dim`
(or where dimension is not specified) are returned.
The return value is an `std::vector<std::pair<birth, death>>`
where `dim` is an `int`, `birth` a `double`, and `death` a `double`.
+Note: the function does not check that birth <= death.
**/
std::vector<std::pair<double, double>> read_persistence_intervals_in_dimension(std::string const& filename, int only_this_dim = -1) {